--- rat/client/Attic/code.html	2000/05/04 21:05:28	1.2
+++ rat/client/Attic/code.html	2000/05/25 12:14:01	1.3
@@ -8,7 +8,8 @@ Resource Assembly Tool
 9/1,9/2,9/4,9/5,9/6,
 1/7,1/8,1/10,1/14,1/15,1/16,1/21,1/22,1/29,1/30,1/31,
 2/2,2/3,2/10,2/12,2/13,2/14,2/15,2/17,2/18,2/19,2/20,2/21,2/22,
-5/2,5/3,5/4 Gerd Kortemeyer with Scott Harrison
+5/2,5/3,5/4,5/5,5/6,5/8,5/9,5/13,5/18,5/20,5/22,5/24
+Gerd Kortemeyer with Scott Harrison
 -->
 
 
@@ -19,6 +20,7 @@ var row=new Array();
 var maxrow=-1;
 var col=new Array();
 var maxcol=-1;
+var lastempty=-2;
 var colmap=new Array();
 var colmap2=new Array();
 var colmap3=new Array();
@@ -46,6 +48,10 @@ var lastinfo='';
 var graphdef='no';
 var mainrun=0;
 var tablemode=0;
+var mostrecent=0;
+
+var disrows=0;
+var discols=0;
 
 var data1=new Array(1024);
 var data2=new Array(1024);
@@ -171,9 +177,10 @@ function newcondition(content,type) {
 
 // ---------------------------------------------- Creates a new resource object
 
-function newresource(rid,cid,text,url) {
+function newresource(rid,cid,text,url,ext,type) {
    stored=0;
-   objcont[addobj(rid,'b&'+rid+'&'+cid+':0:0:0')]=text+':'+url+':res';
+   objcont[addobj(rid,'b&'+rid+'&'+cid+':0:0:0')]=
+    text+':'+url+':'+ext+':'+type+':res';
 }
 
 
@@ -469,10 +476,18 @@ function delobj(obj1) {
 // --------------------------------------------------------- Garbage collection
 
 function cleanup () {
+   message("Garbage Collection");
    var j,kj,i;
-   insertrow(maxrow);
-   insertcol(maxcol);
-   addobj(maxrow,'e&'+maxcol);
+   disrows=0;
+   discols=0;
+
+   if (lastempty!=obj.length) {
+      insertrow(maxrow);
+      insertcol(maxcol);
+      addobj(maxrow,'e&'+maxcol);
+      lastempty=obj.length;
+   }
+
    for (kj=0;kj<=maxcol;kj++) { data1[kj]=0; }
    for (kj=0;kj<=maxrow;kj++) {
      rowtype[kj]=0;
@@ -502,7 +517,12 @@ function cleanup () {
      }
    }
    for (j=0;j<=maxcol;j++) { 
-      coltype[j]=data1[col[j]]; 
+      coltype[j]=data1[col[j]];
+      if (coltype[j]!=0) { discols+=1; } 
+   }
+   for (j=0;j<=maxrow;j++) {
+       if (rowtype[j]==2) { disrows+=3; }
+       if (rowtype[j]==1) { disrows+=1; }
    }
 }
 
@@ -521,7 +541,7 @@ function delcond(obj1,colid) {
       }
    }
 }
-
+    
 // ----------------------------------------- Creates a new condition in a block
 
 function crecond(obj1,colid,condtext,condtype) {
@@ -731,8 +751,9 @@ function delres (obj1,recon) {
    for (k=0;k<inwithlink.length;k++)  { dellink(inwithlink[k]); }
    for (k=0;k<outwithlink.length;k++) { dellink(outwithlink[k]); }
    delobj(obj1);
+   objcont[obj1]='';
    if (recon==1) {
-
+     message("Reconnecting");
       for (k=0;k<inwithlink.length;k++) {
          if (infromobj[k]!=obj1) {
             found=0;
@@ -858,18 +879,20 @@ var condtype;
 if (rowtype[jid]!=0) {
  for (j=0;j<=maxcol;j++) { 
     colmap[j]=''; colmap2[j]=''; colmap3[j]=''; colmap4[j]=''; 
-    colmap5[j]='#FFFFFF'; colmap6[j]='#FFFFFF';
+    colmap5[j]='#CCCCCC'; colmap6[j]='#CCCCCC';
     objd1[j]=''; objd2[j]=''; notempty[j]=0;
  }
+
  parent.mapout.document.writeln('<tr height='+rh[rowtype[jid]]+'>');
  if (rowcont[jid]!='') {
    data2=rowcont[jid].split(':');
    for (jk=0;jk<data2.length;jk++) {
       data3=obj[data2[jk]].split('&');
       if (data3[0]=='b') {
-         rc=(data2[jk]+'F').substr(0,2);
-         gc=('9'+data2[jk]).substr(0,2);
-         bc=(data2[jk]+data2[jk]).substr(0,2);
+         data1=objcont[data2[jk]].split(':');
+         if (data1[2]=='true') { bc='55'; } else { bc='11'; }
+         if (data1[3]=='mandatory') { rc='BB'; } else { rc='55'; }
+         if (data1[3]=='optional') { gc='66'; } else { gc='AA'; }
          ck='#'+rc+gc+bc;
          left=maxcol;
          leftin=maxcol;
@@ -1009,7 +1032,7 @@ if (rowtype[jid]!=0) {
          left=col[data3[1]];
          if (colmap[left]=='') {
             if (data3[3]==1) { colmap[left]='dt'; } else { colmap[left]='td'; }
-            objd1[left]=data2[jk];
+            objd1[left]=data2[jk]+'&'+jid;
             objd2[left]=objd1[left];
          } else {
             colmap[left]='tdrl';
@@ -1024,13 +1047,17 @@ if (rowtype[jid]!=0) {
              notempty[k]);
    }
    if (rowtype[jid]==2) {
-      parent.mapout.document.writeln('</tr><tr>');
+      parent.mapout.document.writeln('</tr>');
+      parent.mapout.document.writeln('<tr height=30>');
       for (k=0;k<=maxcol;k++) {
-       drawcell(1,coltype[rcol[k]],colmap2[k],colmap5[k],objd2[k],jid,k,1);
+       drawcell(1,coltype[rcol[k]],colmap2[k],colmap5[k],objd2[k],jid,k,
+                notempty[k]);
       }
-      parent.mapout.document.writeln('</tr><tr>');
+      parent.mapout.document.writeln('</tr>');
+      parent.mapout.document.writeln('<tr height=30>');
       for (k=0;k<=maxcol;k++) {
-       drawcell(1,coltype[rcol[k]],colmap3[k],colmap6[k],objd2[k],jid,k,1);
+       drawcell(1,coltype[rcol[k]],colmap3[k],colmap6[k],objd2[k],jid,k,
+                notempty[k]);
       }
    }     
  }
@@ -1038,6 +1065,12 @@ if (rowtype[jid]!=0) {
 }
 }
 
+// -------------------------------------------------------------- Print message
+
+function message(txt) {
+   parent.window.status=txt;
+}
+
 // ------------------------------------------------------------- Draw the table
          
 function draw () {
@@ -1046,23 +1079,31 @@ function draw () {
    cleanup();
    save();
 
-   for (k=0;k<=maxrow;k++) { rrow[row[k]]=k; }
-   for (k=0;k<=maxcol;k++) { rcol[col[k]]=k; }
    rh[0]=0;
    rh[1]=30;
    rh[2]=60;
    cw[0]=0;
    cw[1]=30;
    cw[2]=60;
+   parent.mapout.document.clear();
    parent.mapout.document.open('text/html','replace');
    parent.mapout.document.writeln('<html><body bgcolor="#FFFFFF">');
-   parent.mapout.document.writeln(
-      '<table cellpadding=0 cellspacing=0 border=0>');
-
+   
    if (tablemode==0) {
-      for (kr=0;kr<=maxrow;kr++) { drawrow(rrow[kr]); }
+      if (graphdef=='no') { graphopt(); cleanup(); }
+      for (k=0;k<=maxrow;k++) { rrow[row[k]]=k; }
+      for (k=0;k<=maxcol;k++) { rcol[col[k]]=k; }
+     parent.mapout.document.writeln(
+       '<table cellpadding=0 cellspacing=0 border=0 rows='
+       +disrows+' cols='+discols+'>');
+     for (kr=0;kr<=maxrow;kr++) { 
+       message("Generating Output Row "+kr); 
+       drawrow(rrow[kr]); 
+     }
    } else {
-      tabledraw();
+      message("Generating Table Output");
+      parent.mapout.document.writeln( '<table>');
+       tabledraw();
    } 
 
    parent.mapout.document.writeln('</table>');
@@ -1087,6 +1128,10 @@ function infoclear() {
       '<td><b>Link Mode</b><hr>Click on a resource to link it with<br><b>'+
       (objcont[linkmode].split(':'))[0]+
       '</b><br>click anywhere else to cancel.</td>');
+  } else {
+      inf.document.writeln(
+'<td><b>Click to Edit</b><hr>Click to insert resources, columns and rows</td>'
+      );
   }
   inf.document.writeln('</tr></table></body></html>');
   inf.document.close();
@@ -1130,9 +1175,17 @@ function info(infostr) {
                  '</b><br>to <b>'+objcont[data3[1]].split(':')[0]+'</b>');
   } else {
      if (data1[0]=='r') {
-        inf.document.writeln('<b>Resource</b><hr>');
         data2=objcont[data1[1]].split(':');
-        inf.document.writeln('<b>'+data2[0]+'</b><br>');
+        inf.document.write('<b>');
+        if (data2[2]=='true') { inf.document.write('External '); }
+        inf.document.write('Resource');
+        if (data2[3]=='mandatory') {
+           inf.document.write(' (Mandatory)');
+        }
+        if (data2[3]=='optional') {
+           inf.document.write(' (Optional)');
+        }
+        inf.document.writeln('</b><hr><b>'+data2[0]+'</b><br>');
         inf.document.writeln((data2[1].split('/')).join(' / '));
      } else {
         inf.document.writeln('<b>Link</b><hr>');
@@ -1180,7 +1233,30 @@ function escape(instring) {
 // -------------------------------------------------- Insert resource into link
 
 function insertreslink(infostr) {
-   alert(infostr);
+   var lnr;
+   var fobj;
+   var tobj;
+   var nobj;
+   var cobj;
+   data1=infostr.split('&');
+   data2=obj[data1[0]].split('&');
+   lnr=data2[data2.length-2];
+   data3=objlinks[lnr].split(':');
+   fobj=data3[0];
+   tobj=data3[1];
+   cobj=data3[2];
+   if (data2[0]=='v') {
+      rid=data1[1];
+      cid=data2[1];
+   } else {
+      rid=data2[1];
+      cid=(data2[2].split(':'))[0];
+   }
+   dellink(lnr);
+   newresource(rid,cid,'','','false','normal');
+   nobj=obj.length-1;
+   joinres(fobj,nobj,cobj);
+   joinres(nobj,tobj,0);
 }
 
 // ---------------------------------------------------- Handles "click to edit"
@@ -1205,7 +1281,7 @@ function handler(infostr) {
         data2=objcont[data1[4]].split(':');
      }
      inf.document.writeln(
-         '<form name=condinfo><textarea name=c cols=40 rows=4>'
+         '<form name=condinfo><textarea name=c cols=30 rows=3>'
          +data2[0]+'</textarea><br><input type=radio name=s value=normal '+
     'onClick="self.document.forms.condinfo.elements.h.value='+"'normal'"+'"');
      if (data2[1]=='normal') { inf.document.write(' checked'); }
@@ -1231,16 +1307,19 @@ function handler(infostr) {
      }
      inf.document.writeln(
       'opener.infoclear();opener.editmode=0;opener.draw('
-      +');">Change to above values</a>&nbsp;&nbsp;'
-      +' <a href="javascript:self.document.forms.condinfo.reset()">Reset</a>'
-      +'<input type=hidden name=h value='+data2[1]
-      +'></form>');
+      +');"><b>Change to above values</b></a>&nbsp;&nbsp;'
+    +' <a href="javascript:self.document.forms.condinfo.reset()">Reset</a><br>'
+      +'<input type=hidden name=h value='+data2[1]+'>');
 
         inf.document.writeln(
            '<a href="javascript:opener.notclear=0;opener.infoclear();'
    +'opener.delcond('+data1[2]+','+data1[1]+');opener.editmode=0;opener.draw('
-         +');">Delete Condition</a>');
-  } else {
+         +');">Delete Condition</a><br>');
+          inf.document.writeln(
+           '<a href="javascript:opener.notclear=0;opener.infoclear();'
+   +'opener.dellink('+data1[3]+');opener.editmode=0;opener.draw('
+         +');">Delete Link</a>');
+} else {
      if (data1[0]=='r') {
        if (linkmode!=0) {
         joinres(linkmode,data1[1],0);
@@ -1254,21 +1333,35 @@ function handler(infostr) {
         data2=objcont[data1[1]].split(':');
         inf.document.write(
          '<form name=resinfo><table><tr><td>Title:</td><td>'
-        +'<input type=text name=t size=40 value="'
+        +'<input type=text name=t size=30 value="'
         +data2[0]+'"></td></tr><tr><td>URL:</td><td>'
-        +'<input type=text name=u size=40 value="'+data2[1]+'"></td></tr>'
+        +'<input type=text name=u size=30 value="'+data2[1]+'"></td></tr>'
         +'<tr><td>External:</td><td><input type=checkbox name=e');
         if (data2[2]=='true') { inf.document.write(' checked'); }
-        inf.document.writeln('></td></tr>'
+        inf.document.write('></td></tr>'
+        +'<tr><td colspan=2><input type=hidden name=h value='+data2[3]
+        +'><input type=radio name=y value=normal '+
+ 'onClick="self.document.forms.resinfo.elements.h.value='+"'normal'"+'"');
+     if (data2[3]=='normal') { inf.document.write(' checked'); }
+     inf.document.write(
+      '> Regular&nbsp;&nbsp;<input type=radio name=y value=mandatory '+
+ 'onClick="self.document.forms.resinfo.elements.h.value='+"'mandatory'"+'"');
+     if (data2[3]=='mandatory') { inf.document.write(' checked'); }
+     inf.document.write(
+      '> Mandatory&nbsp;&nbsp;<input type=radio name=y value=optional '+
+ 'onClick="self.document.forms.resinfo.elements.h.value='+"'optional'"+'"');
+     if (data2[3]=='optional') { inf.document.write(' checked'); }
+     inf.document.write('> Optional</td></tr>'
         +'<tr><td colspan=2><a href="javascript:opener.editmode=0;'
         +'opener.notclear=0;opener.objcont['+data1[1]
         +']=opener.escape(self.document.forms.resinfo.elements.t.value)+'+"':'"
         +'+opener.escape(self.document.forms.resinfo.elements.u.value)+'+"':'"
-        +'+self.document.forms.resinfo.elements.e.checked+'+"':res'"
-        +';opener.infoclear();">'
-        +'Change to above values</a>&nbsp;&nbsp;'
+        +'+self.document.forms.resinfo.elements.e.checked+'+"':'"
+        +'+self.document.forms.resinfo.elements.h.value+'+"':res'"
+        +';opener.infoclear();opener.editmode=0;opener.draw();">'
+        +'<b>Change to above values</b></a>&nbsp;&nbsp;'
         +' <a href="javascript:self.document.forms.resinfo.reset()">Reset</a>'
-        +'</td></tr></table></form>');
+        +'</td></tr></table>');
         inf.document.writeln(
            '<a href="javascript:opener.notclear=0;opener.infoclear();'
          +'opener.delres('+data1[1]+',0);opener.editmode=0;opener.draw('
@@ -1284,7 +1377,7 @@ function handler(infostr) {
       }
      } else {
         linkmode=0;
-        inf.document.writeln('<b>Link</b><hr>');
+        inf.document.writeln('<b>Link</b><hr><form>');
         data2=obj[data1[0]].split('&');
         k=data2[data2.length-2];
         data3=objlinks[k].split(':');
@@ -1294,7 +1387,7 @@ function handler(infostr) {
      k+');opener.editmode=0;opener.notclear=0;opener.infoclear();opener.draw('
                               +');">Delete Link</a>');
         inf.document.writeln('<br><a href="javascript:'+
-         'opener.insertreslink('+infostr+');'+
+         "opener.insertreslink('"+infostr+"');"+
          'opener.editmode=0;opener.notclear=0;opener.infoclear();opener.draw('
                               +');">Insert Resource Into Link</a>');
      }
@@ -1302,7 +1395,7 @@ function handler(infostr) {
   inf.document.writeln(
      '<br><a href="javascript:opener.editmode=0;opener.notclear=0;'
      +'opener.infoclear();">Done</a>');
-  inf.document.writeln('</td></tr></table></body></html>');
+  inf.document.writeln('</form></td></tr></table></body></html>');
   inf.document.close();
   inf.focus();
 }
@@ -1326,9 +1419,29 @@ function empty(rid,k) {
    '<b>Empty Field</b><hr>');
 
         inf.document.writeln('<br><a href="javascript:opener.newresource('+
-          rid+','+cid+",'','');"+
+          rid+','+cid+",'','','false','normal');"+
+         'opener.mostrecent=opener.obj.length-1;'+
+         'opener.editmode=0;opener.notclear=0;opener.infoclear();opener.draw('
+          +');">Insert resource</a>');
+
+  if ((mostrecent!=0) && (objcont[mostrecent]!='')) {
+
+        inf.document.writeln('<br><a href="javascript:opener.newresource('+
+          rid+','+cid+",'','','false','normal');"+
+         'opener.mostrecent=opener.obj.length-1;'+
+        'opener.joinres('+mostrecent+',opener.obj.length-1,0);'+
   'opener.editmode=0;opener.notclear=0;opener.infoclear();opener.draw('
-          +');">Insert Resource</a>');
+          +');">Insert resource linked to from most recent one</a>');
+
+        inf.document.writeln('<br><a href="javascript:opener.newresource('+
+          rid+','+cid+",'','','false','normal');"+
+         'opener.mostrecent=opener.obj.length-1;'+
+        'opener.joinres(opener.obj.length-1,'+mostrecent+',0);'+
+  'opener.editmode=0;opener.notclear=0;opener.infoclear();opener.draw('
+          +');">Insert resource linking to most recent one</a>');
+  }
+
+
   inf.document.writeln('<hr>Insert column:');
         inf.document.writeln('<a href="javascript:opener.insertcol('+
         lcol+');opener.addobj('+rid+",'e&'+opener.maxcol);"
@@ -1360,7 +1473,8 @@ function empty(rid,k) {
 // ---------------------------------------------------- Save into hidden fields
 
 function save() {
-   var k;
+  var k;
+  if (graphdef=='yes') {
    parent.server.document.forms.storage.output.value='graphdef<:>yes';
    for (k=0;k<obj.length;k++) {
          parent.server.document.forms.storage.output.value+=
@@ -1384,7 +1498,12 @@ function save() {
       '<&>maxcol<:>'+maxcol; 
    parent.server.document.forms.storage.output.value+=
       '<&>maxrow<:>'+maxrow;
-
+ } else {
+   parent.server.document.forms.storage.output.value='graphdef<:>no';
+ }
+ parent.server.document.forms.storage.output.value+=
+   '<&>tablemode<:>'+tablemode;
+   
    for (k=0;k<objcont.length;k++) {
       if (objcont[k]) {
          parent.server.document.forms.storage.output.value+=
@@ -1442,18 +1561,114 @@ function rescompare(a,b) {
       if (data2[k]==data1[0]) { rvalue++; }
    }
    if (rvalue==0) { rvalue=data2.length-data1.length; }
-
    return rvalue;
 }
 
 // -------------------------------------------- Draw the table instead of graph
 
 function tabledraw() {
+  var objsorted=new Array();
+  var robjs=new Array();
+  var k;
+  var i;
+  var j;
+  var nr;
+  var bc; var rc; var gc; var ck;
+  var sortstr=sortobjs();
+ if (sortstr!='') {
+  objsorted=sortstr.split('&');
+  for (k=0;k<objsorted.length;k++) {
+     robjs[objsorted[k]]=k;
+  }
+  for (k=0;k<objsorted.length;k++) {
+       i=(objsorted[k].split(':'))[0];
+       if (k<objsorted.length-1) {
+          nr=(objsorted[k+1].split(':'))[0];
+       } else {
+          nr=-1;
+       }
+       data1=objcont[i].split(':');
+         if (data1[2]=='true') { bc='55'; } else { bc='11'; }
+         if (data1[3]=='mandatory') { rc='BB'; } else { rc='55'; }
+         if (data1[3]=='optional') { gc='66'; } else { gc='AA'; }
+        ck='#'+rc+gc+bc;
+        parent.mapout.document.write('<tr><td bgcolor="'+ck
+        +'"><b>'+k+'</td><td bgcolor="'+ck
+        +'"><form name=r'+i+' method=post>');
+      data2=obj[i].split('&');
+      parent.mapout.document.write('<table bgcolor="#CCCCCC">');
+      parent.mapout.document.write(
+       '<tr><td>Title:</td><td><input type=text name=t size=30 value="'
+                                   +data1[0]+'"></td></tr>');
+      parent.mapout.document.write(
+       '<tr><td>URL:</td><td><input type=text name=u size=30 value="'
+                                  +data1[1]+'"></td></tr>'
+          +'<tr><td>External:</td><td><input type=checkbox name=e');
+        if (data1[2]=='true') { parent.mapout.document.write(' checked'); }
+        parent.mapout.document.write('></td></tr>'
+        +'<tr><td colspan=2><input type=hidden name=h value='+data1[3]
+        +'><input type=radio name=y value=normal '+
+ 'onClick="parent.mapout.document.forms.r'+i+'.elements.h.value='+
+     "'normal'"+'"');
+     if (data1[3]=='normal') { parent.mapout.document.write(' checked'); }
+     parent.mapout.document.write(
+      '> Regular&nbsp;&nbsp;<input type=radio name=y value=mandatory '+
+ 'onClick="parent.mapout.document.forms.r'+i+'.elements.h.value='+
+     "'mandatory'"+'"');
+     if (data1[3]=='mandatory') { parent.mapout.document.write(' checked'); }
+     parent.mapout.document.write(
+      '> Mandatory&nbsp;&nbsp;<input type=radio name=y value=optional '+
+ 'onClick="parent.mapout.document.forms.r'+i+'.elements.h.value='+
+     "'optional'"+'"');
+     if (data1[3]=='optional') { parent.mapout.document.write(' checked'); }
+     parent.mapout.document.write('> Optional</td></tr>'
+        +'<tr><td colspan=2><a href="javascript:parent.code.objcont['+i        
+        +']=parent.code.escape(parent.mapout.document.forms.r'+i
+        +'.elements.t.value)+'+"':'"
+        +'+parent.code.escape(parent.mapout.document.forms.r'+i
+        +'.elements.u.value)+'+"':'"
+        +'+parent.mapout.document.forms.r'+i+'.elements.e.checked+'+"':'"
+        +'+parent.mapout.document.forms.r'+i+'.elements.h.value+'+"':res'"
+        +';parent.code.draw();">'
+        +'<b>Change to above values</b></a>&nbsp;&nbsp;'
+        +' <a href="javascript:parent.mapout.document.forms.r'+i
+        +'.reset()">Reset</a><br><table><tr>');
+       for (j=2;j<data2.length;j++) {
+           data3=objlinks[(data2[j].split(':'))[2]].split(':');
+           if (data3.length>1) {
+              if (data3[1]==nr) {
+                 parent.mapout.document.writeln('<td>Next<br>'+data3);
+                 parent.mapout.document.writeln('</td>');
+              }
+           }
+       }
+       for (j=2;j<data2.length;j++) {
+           data3=objlinks[(data2[j].split(':'))[2]].split(':');
+           if (data3.length>1) {
+              if ((data3[1]!=nr) && (data3[1]!=0)) {
+                 parent.mapout.document.writeln(
+                  '<td>To: '+robjs[data3[1]]+'<br>');
+                 parent.mapout.document.writeln('</td>');
+              }
+           }
+       }
+       parent.mapout.document.writeln(
+        '</tr></table></td></tr></table></form></td></tr>');
+   }
+  }
+}
+
+// ---------------------------------- Sort objects to straighten graph or table
+
+function sortobjs() {
+   message("Sorting Resources");
    var k;
    var ij;
+   var dol;
+   var dtl;
    var kj;
+   var sortthis=0;
    var objsort=new Array();
-   var objsorted=new Array();
    for (k=1;k<objcont.length;k++) {
       if (objcont[k]) {
          data1=objcont[k].split(':');
@@ -1462,7 +1677,10 @@ function tabledraw() {
          }
       }
    }
+   if (objsort.length==0) { return ''; }
    for (k=1;k<objlinks.length;k++) {
+     if (objlinks[k]!='') {
+      sortthis=1;
       data1=objlinks[k].split(':');
       kj=-1;
       for (j=0;j<objsort.length;j++) {
@@ -1471,43 +1689,54 @@ function tabledraw() {
          }
       }
       objsort[kj]+=':'+data1[1];
+     }
    }
-   objsorted=objsort.sort(rescompare);
-   for (ij=0;ij<objsorted.length;ij++) {
-      
+   if (sortthis!=0) {
+    for (k=0;k<objsort.length;k++) {
+      for (j=0;j<objsort.length;j++) {
+        if (k!=j) {
+          data1=objsort[k].split(':');
+          data2=objsort[j].split(':');
+          dol=data1.length;
+          dtl=data2.length;
+          for (kj=1;kj<dol;kj++) {
+             if (data1[kj]==data2[0]) {
+                for (ij=1;ij<dtl;ij++) {
+                   data1[data1.length]=data2[ij];
+                }
+             }
+          }
+          for (kj=1;kj<dtl;kj++) {
+             if (data2[kj]==data1[0]) {
+                 for (ij=1;ij<dol;ij++) {
+                   data2[data2.length]=data1[ij];
+                }
+            }
+          }
+          objsort[k]=data1.join(':');
+          objsort[j]=data2.join(':');
+         }
+      } 
    }
-   alert("Table mode not yet implemented");
+   return objsort.sort(rescompare).join('&');
+  } else {
+   return objsort.join('&');
+  }
 }
 
-// ------------------------------------------- Sort objects to straighten graph
+// ----------------------------------------------------------- Straighten graph
 
 function graphopt() {
-   var k;
-   var ij;
-   var kj;
-   var objsort=new Array();
-   var objsorted=new Array();
-   condense();
-   graphreset();
-   for (k=1;k<objcont.length;k++) {
-      if (objcont[k]) {
-         data1=objcont[k].split(':');
-         if (data1[data1.length-1]=='res') {
-            objsort[objsort.length]=''+k;
-         }
-      }
-   }
-   for (k=1;k<objlinks.length;k++) {
-      data1=objlinks[k].split(':');
-      kj=-1;
-      for (j=0;j<objsort.length;j++) {
-         if ((objsort[j].split(':'))[0]==data1[0]) {
-            kj=j;
-         }
-      }
-      objsort[kj]+=':'+data1[1];
-   }
-   objsorted=objsort.sort(rescompare);
+  var k;
+  var kj;
+  var ij;
+
+  var objsorted=new Array();
+  condense(); 
+  graphreset();
+  objsorted=(sortobjs()).split('&');
+  if (objsorted.length==0) { return; }
+   message("Creating Optimized Graph");
    var thisnewobj=''+(objsorted[0].split(':'))[0];
    rowcont[1]=thisnewobj;
    var thiscolmax=1;
@@ -1550,11 +1779,13 @@ function graphopt() {
          }
       }
    }
+   graphdef='yes';
 }
 
 // ----------------------------------------------------------- Remove e-objects
 
 function condense() {
+   message("Condensing");
    var j;
    for (j=0;j<=maxrow;j++) {
      if (rowcont[j]!='') {
@@ -1568,6 +1799,7 @@ function condense() {
       }
      }
    }
+   lastempty=-2;
 }
 
 // ---------------------------------------------------- Load from hidden fields
@@ -1582,6 +1814,7 @@ function load() {
    lastinfo='';
    graphreset();
    var inputstr=parent.server.document.forms.storage.output.value;
+   if (inputstr!='') {
    data1=inputstr.split('<&>');
    var k;
    for (k=0;k<data1.length;k++) {
@@ -1595,7 +1828,9 @@ function load() {
        if (data2[0]=='rowcont') { rowcont[data2[1]]=data2[2]; }
        if (data2[0]=='row') { row[data2[1]]=1*data2[2]; }
        if (data2[0]=='col') { col[data2[1]]=1*data2[2]; }
+       if (data2[0]=='tablemode') { tablemode=1*data2[1]; }
    }
+  }
 }
 
 // -------------------------------------------------------------- Undo function