--- rat/client/Attic/code.html	2000/06/08 16:19:50	1.4
+++ rat/client/Attic/code.html	2000/08/24 15:04:44	1.12
@@ -9,7 +9,7 @@ Resource Assembly Tool
 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,5/5,5/6,5/8,5/9,5/13,5/18,5/20,5/22,5/24,5/25,
-6/7,6/8
+6/7,6/8,6/9,6/10,6/12,6/15,7/4,7/26,7/28,7/31,8/5,8/19,8/24
 Gerd Kortemeyer with Scott Harrison
 -->
 
@@ -21,7 +21,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();
@@ -47,6 +47,7 @@ var notclear=0;
 var linkmode=0;
 var lastinfo='';
 var graphdef='no';
+var mode='';
 var mainrun=0;
 var tablemode=0;
 var mostrecent=0;
@@ -55,18 +56,28 @@ var zscale=3;
 var disrows=0;
 var discols=0;
 
+var finishdone=0;
+var tim=0;
+var funny='|';
+var reqaction='';
+var canceltim;
+
+var expense=0;
+
 var data1=new Array(1024);
 var data2=new Array(1024);
 var data3=new Array(1024);
 var data4=new Array(1024);
 var data5=new Array(1024);
 
+var inf;
 
 // ------------------------------------------------ Insert a row into the table
 
 function insertrow(j,ex1,ex2) {
    var kj;
    stored=0;
+   expense++; expense++;
    objects1='';
    objects2='';
    for (kj=0;kj<=maxrow;kj++) {
@@ -212,6 +223,7 @@ function insertcol(j) {
       if ( col[kj]>j ) { col[kj]++; } 
    }
    maxcol++;
+   expense++; expense++;
    col[maxcol]=j+1;
 }
      
@@ -335,7 +347,6 @@ function comingthru (jid,kid,dkid) {
 
 function insertport (obj1,d,inout,linkobj) {
 
-
    var k; var port; var revport;
    stored=0;
    data1=obj[obj1].split('&');
@@ -414,6 +425,7 @@ function insertport (obj1,d,inout,linkob
  
 function addobj(kjid,objs) {
    stored=0;
+   expense++;
    if (rowcont[kjid]!='') { rowcont[kjid]+=':'; }
    rowcont[kjid]+=obj.length;
    obj[obj.length]=objs;
@@ -473,6 +485,7 @@ function delobj(obj1) {
          }
       }
    }
+   obj[obj1]='';
 }
 
 // --------------------------------------------------------- Garbage collection
@@ -482,13 +495,7 @@ function cleanup () {
    var j,kj,i;
    disrows=0;
    discols=0;
-
-   if (lastempty!=obj.length) {
-      insertrow(maxrow);
-      insertcol(maxcol);
-      addobj(maxrow,'e&'+maxcol);
-      lastempty=obj.length;
-   }
+   var emptyspots=0;
 
    for (kj=0;kj<=maxcol;kj++) { data1[kj]=0; }
    for (kj=0;kj<=maxrow;kj++) {
@@ -512,6 +519,7 @@ function cleanup () {
               }
               if (obj[colmap[j]].substring(0,2)=='b&') { 
                  data1[j]=2;
+                 if (colmap[maxcol]==0) { emptyspots++; }
                  rowtype[kj]=2;
               }  
            }
@@ -526,6 +534,16 @@ function cleanup () {
        if (rowtype[j]==2) { disrows+=3; }
        if (rowtype[j]==1) { disrows+=1; }
    }
+   if (emptyspots==0) {
+      insertrow(maxrow);
+      insertcol(maxcol);
+      addobj(maxrow,'e&'+maxcol);
+      discols++;
+      disrows++;
+      rowtype[maxrow]=2;
+      coltype[maxcol]=2;
+   }
+
 }
 
 // -------------------------------------------- Delete a condition from a block
@@ -614,22 +632,65 @@ function dellink (linknr) {
 // Links obj1 with obj2, creates new objlink, marks all elements with number
 
 function joinres (obj1,obj2,cond) {
-   var k; var kr; var outcol; var incol; var d;
    stored=0;
+   var minexpense;
+   var best;
+
+   expense=0;
+   tryjoin(obj1,obj2,cond,1,1);
+   minexpense=expense;
+   best=0;
+   finishload();
+
+   expense=0;
+   tryjoin(obj1,obj2,cond,1,-1);
+   if (expense<minexpense) {
+      best=1;
+      minexpense=expense;
+   }
+   finishload();
+
+   expense=0;
+   tryjoin(obj1,obj2,cond,-1,1);
+   if (expense<minexpense) {
+      best=2;
+      minexpense=expense;
+   }
+   finishload();
+
+   expense=0;
+   tryjoin(obj1,obj2,cond,-1,-1);
+   if (expense<minexpense) {
+      best=3;
+      minexpense=expense;
+   }
+
+
+   if (best==0) {
+      finishload();
+      tryjoin(obj1,obj2,cond,1,1);
+   }
+   if (best==1) {
+      finishload();
+      tryjoin(obj1,obj2,cond,1,-1);
+   }
+   if (best==2) {
+      finishload();
+      tryjoin(obj1,obj2,cond,-1,1);
+   }
+
+}
+
+
+function tryjoin(obj1,obj2,cond,d1,d2) {
+   var k; var kr; var outcol; var incol; var d; var dest;
+
    dest=objlinks.length;
    objlinks[dest]=obj1+':'+obj2+':'+cond;
-   data3=obj[obj1].split('&');
-   sum=0;
-   for (k=2;k<data3.length;k++) { sum+=col[data3[k].split(':')[0]]; }
-   outmiddle=sum/(data3.length-2);
-   data3=obj[obj2].split('&');
-   sum=0;
-   for (k=2;k<data3.length;k++) { sum+=col[data3[k].split(':')[0]]; }
-   inmiddle=sum/(data3.length-2);
-   d=inmiddle-outmiddle;
-   outcol=insertport(obj1,d,2,dest);
+
+   outcol=insertport(obj1,d1,2,dest);
    insertcond(obj1,outcol,cond);
-   incol=insertport(obj2,-d,1,dest);
+   incol=insertport(obj2,d2,1,dest);
    if (row[inrow]==(row[outrow]+1)) {
       insertrow(row[outrow],-1,-1);
    }
@@ -822,7 +883,8 @@ function delres (obj1,recon) {
                  thiscond+='('+outobjscond[k2]+')';
               }
               condnr=0;
-              if (thiscond!='') { condnr=newcondition(thiscond,'normal'); } 
+              if (thiscond!='') { condnr=newcondition(thiscond,'normal'); }
+              save(); 
               joinres(inobjs[k],outobjs[k2],condnr);
           }
       }
@@ -853,9 +915,21 @@ function drawcell (rtype,ctype,what,cm,o
             ('<img border=0 width='+cw[ctype]+' height='+rh[rtype]
              +' src="condition.gif">');          
         } else {
-           parent.mapout.document.write
-            ('<img border=0 width='+cw[ctype]+' height='+rh[rtype]+' src="'
-             +rtype+'.'+ctype+'.'+what+'.gif">');
+           if (what=='rs:') {
+              parent.mapout.document.write
+               ('<img border=0 width='+cw[ctype]+' height='+rh[rtype]
+               +' src="start.gif">');
+           } else {
+             if (what=='rf:') {
+                parent.mapout.document.write
+                ('<img border=0 width='+cw[ctype]+' height='+rh[rtype]
+                +' src="finish.gif">');
+             } else {
+                parent.mapout.document.write
+                ('<img border=0 width='+cw[ctype]+' height='+rh[rtype]
+                +' src="'+rtype+'.'+ctype+'.'+what+'.gif">');
+             }
+           }
         }
      }
      if (obj1!='') {
@@ -887,7 +961,7 @@ function rescolor (ext,typ) {
    if (ext=='true') { bc='55'; } else { bc='99'; }
    if (typ=='mandatory') { rc='FF'; } else { rc='BB'; }
    if (typ=='optional') { gc='BB'; } else { gc='FF'; }
-   if ((typ=='start') || (typ=='end')) { rc='AA'; gc='AA'; bc='FF'; }
+   if ((typ=='start') || (typ=='finish')) { rc='AA'; gc='AA'; bc='FF'; }
    return '#'+rc+gc+bc;
 }
 
@@ -902,7 +976,7 @@ function condcolor(typ) {
 // ----------------------------------------------------------------- Draw a row
 
 function drawrow (jid) {
-var j; var jk; var k;  var ck;
+var j; var jk; var k;  var ck; var rtype;
 var objd1=new Array();
 var objd2=new Array();
 var notempty=new Array();
@@ -921,6 +995,7 @@ if (rowtype[jid]!=0) {
       data3=obj[data2[jk]].split('&');
       if (data3[0]=='b') {
          data1=objcont[data2[jk]].split(':');
+         rtype=data1[3];
          ck=rescolor(data1[2],data1[3]);
          left=maxcol;
          leftin=maxcol;
@@ -958,7 +1033,15 @@ if (rowtype[jid]!=0) {
          }
          for (k=left;k<=right;k++) { notempty[k]=1; colmap5[k]=ck; }
          middle=Math.round((left+right)/2);
-         colmap[middle]='r:';
+         if (rtype=='start') {
+            colmap[middle]='rs:';
+         } else {
+            if (rtype=='finish') {
+               colmap[middle]='rf:';
+            } else {
+               colmap[middle]='r:';
+            }
+         }
          objd1[middle]+='r&'+data2[jk];
 
          if (rightin>middle) {
@@ -1077,13 +1160,13 @@ if (rowtype[jid]!=0) {
    }
    if (rowtype[jid]==2) {
       parent.mapout.document.writeln('</tr>');
-      parent.mapout.document.writeln('<tr height=30>');
+      parent.mapout.document.writeln('<tr height='+rh[1]+'>');
       for (k=0;k<=maxcol;k++) {
        drawcell(1,coltype[rcol[k]],colmap2[k],colmap5[k],objd2[k],jid,k,
                 notempty[k]);
       }
       parent.mapout.document.writeln('</tr>');
-      parent.mapout.document.writeln('<tr height=30>');
+      parent.mapout.document.writeln('<tr height='+rh[1]+'>');
       for (k=0;k<=maxcol;k++) {
        drawcell(1,coltype[rcol[k]],colmap3[k],colmap6[k],objd2[k],jid,k,
                 notempty[k]);
@@ -1125,7 +1208,7 @@ function draw () {
       parent.mapout.document.writeln(
        '<table cellpadding=0 cellspacing=0 border=0 rows='
        +disrows+' cols='+discols+'>');
-      for (kr=0;kr<=maxrow;kr++) { 
+      for (kr=0;kr<=maxrow;kr++) {
         message("Generating Output Row "+kr); 
         drawrow(rrow[kr]); 
       }
@@ -1153,8 +1236,7 @@ function draw () {
 
 function infoclear() {
  if (notclear!=1) {
-  var options="scrollbars=1,resizable=1,menubar=0,width=400,height=300";
-  var inf=open("","infout",options);
+  infcheck();
   inf.document.clear();
   inf.document.writeln
    ('<html><body bgcolor="#FFFFFF"><table><tr><td>'+
@@ -1189,13 +1271,27 @@ function infoclear() {
  }
 }
 
+// ------------------------------------------------------------ Open inf window
+
+function infopen() {
+   var options="scrollbars=1,resizable=1,menubar=0,width=400,height=300";
+   inf=open("","infout",options);
+}
+
+// -------------------------------------------------------- Do inf status check
+
+function infcheck() {
+   if (inf.closed) {
+      infopen();
+   }
+}
+
 // --------------------------------------------------- Prints out resource info
 
 function info(infostr) {
  if ((editmode!=1) && (infostr!=lastinfo)) {
   notclear=1;
-  var options="scrollbars=1,resizable=1,menubar=0,width=400,height=300";
-  var inf=open("","infout",options);
+  infcheck();
   inf.document.clear();
   inf.document.writeln(
    '<html><body bgcolor="#FFFFFF">'+
@@ -1225,7 +1321,15 @@ function info(infostr) {
         data2=objcont[data1[1]].split(':');
         inf.document.write('<b>');
         if (data2[2]=='true') { inf.document.write('External '); }
-        inf.document.write('Resource');
+        if (data2[3]=='start') {
+           inf.document.writeln('<b>Start</b>');
+        } else {
+           if (data2[3]=='finish') {
+              inf.document.writeln('<b>Finish</b>');
+           } else {
+              inf.document.writeln('<b>Resource</b>');
+           }
+        }
         if (data2[3]=='mandatory') {
            inf.document.write(' (Mandatory)');
         }
@@ -1285,6 +1389,8 @@ function insertreslink(infostr) {
    var tobj;
    var nobj;
    var cobj;
+   var cid;
+   var rid;
    data1=infostr.split('&');
    data2=obj[data1[0]].split('&');
    lnr=data2[data2.length-2];
@@ -1302,7 +1408,31 @@ function insertreslink(infostr) {
    dellink(lnr);
    newresource(rid,cid,'','','false','normal');
    nobj=obj.length-1;
+   save();
    joinres(fobj,nobj,cobj);
+   save();
+   joinres(nobj,tobj,0);
+}
+
+// -------------------------------------------- Insert resource after condition
+
+function insertcondlink(cid,lnr) {
+   var fobj;
+   var tobj;
+   var nobj;
+   var cobj;
+   data3=objlinks[lnr].split(':');
+   fobj=data3[0];
+   tobj=data3[1];
+   cobj=data3[2];
+   rid=(obj[fobj].split('&'))[1];
+   insertrow(row[rid]);
+   dellink(lnr);
+   newresource(maxrow,cid,'','','false','normal');
+   nobj=obj.length-1;
+   save();
+   joinres(fobj,nobj,cobj);
+   save();
    joinres(nobj,tobj,0);
 }
 
@@ -1312,8 +1442,7 @@ function handler(infostr) {
   var k;
   editmode=1;
   notclear=1;
-  var options="scrollbars=1,resizable=1,menubar=0,width=400,height=300";
-  var inf=open("","infout",options);
+  infcheck();
   inf.document.clear();
   inf.document.writeln(
    '<html><body bgcolor="#FFFFFF">'+
@@ -1366,6 +1495,13 @@ function handler(infostr) {
            '<a href="javascript:opener.notclear=0;opener.infoclear();'
    +'opener.dellink('+data1[3]+');opener.editmode=0;opener.draw('
          +');">Delete Link</a>');
+
+        inf.document.writeln('<br><a href="javascript:'+
+         'opener.insertcondlink('+data1[1]+','+data1[3]+');'+
+         'opener.editmode=0;opener.notclear=0;opener.infoclear();opener.draw('
+                              +');">Insert Resource Into Link</a>');
+
+
 } else {
      if (data1[0]=='r') {
        if (linkmode!=0) {
@@ -1376,18 +1512,28 @@ function handler(infostr) {
         inf.document.writeln('<b>Linked Resources</b>');
         draw();
        } else {
-        inf.document.writeln('<b>Resource</b>');
         data2=objcont[data1[1]].split(':');
+        if (data2[3]=='start') {
+           inf.document.writeln('<b>Start</b>');
+        } else {
+           if (data2[3]=='finish') {
+              inf.document.writeln('<b>Finish</b>');
+           } else {
+              inf.document.writeln('<b>Resource</b>');
+           }
+        }
         inf.document.write(
          '<form name=resinfo><table><tr><td>Title:</td><td>'
         +'<input type=text name=t size=30 value="'
-        +data2[0]+'"></td></tr><tr><td>URL:</td><td>'
+        +data2[0]+'"><input type=hidden name=h value='+data2[3]+'></td></tr>');
+    if ((data2[3]!='start') && (data2[3]!='finish')) {
+           inf.document.write('<tr><td>URL:</td><td>'
         +'<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.write('></td></tr>'
-        +'<tr><td colspan=2><input type=hidden name=h value='+data2[3]
-        +'><input type=radio name=y value=normal '+
+        +'<tr><td colspan=2>'
+        +'<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(
@@ -1398,8 +1544,14 @@ function handler(infostr) {
       '> 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;'
+     inf.document.write('> Optional</td></tr>');
+    } else {
+     inf.document.write(
+        '<tr><td><input type=hidden name=e value=false>'
+               +'<input type=hidden name=u value=""></td></tr>');
+    }
+        inf.document.writeln(
+         '<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)+'+"':'"
@@ -1409,6 +1561,7 @@ function handler(infostr) {
         +'<b>Change to above values</b></a>&nbsp;&nbsp;'
         +' <a href="javascript:self.document.forms.resinfo.reset()">Reset</a>'
         +'</td></tr></table>');
+    if ((data2[3]!='start') && (data2[3]!='finish')) {
         inf.document.writeln(
            '<a href="javascript:opener.notclear=0;opener.infoclear();'
          +'opener.delres('+data1[1]+',0);opener.editmode=0;opener.draw('
@@ -1417,10 +1570,13 @@ function handler(infostr) {
           '<br><a href="javascript:opener.notclear=0;opener.infoclear();'
          +'opener.delres('+data1[1]+',1);opener.editmode=0;opener.draw('
          +');">Delete Resource (preserving links)</a>');
+    }
+    if (data2[3]!='finish') {
         inf.document.writeln(
           '<br><a href="javascript:opener.editmode=0;opener.notclear=0;'
          +'opener.linkmode='+data1[1]+';'
          +'opener.infoclear();">Link Resource</a>');
+    }
       }
      } else {
         linkmode=0;
@@ -1457,8 +1613,7 @@ function empty(rid,k) {
   editmode=1;
   notclear=1;
   linkmode=0;
-  var options="scrollbars=1,resizable=1,menubar=0,width=400,height=300";
-  var inf=open("","infout",options);
+  infcheck();
   inf.document.clear();
   inf.document.writeln(
    '<html><body bgcolor="#FFFFFF">'+
@@ -1523,7 +1678,7 @@ function save() {
   var k;
   if (graphdef=='yes') {
    parent.server.document.forms.storage.output.value='graphdef<:>yes';
-   for (k=0;k<obj.length;k++) {
+   for (k=1;k<obj.length;k++) {
          parent.server.document.forms.storage.output.value+=
           '<&>obj<:>'+k+'<:>'+obj[k];
    }
@@ -1593,11 +1748,12 @@ function graphreset() {
    insertcol(-1);
 
    objcont[0]='';
-   objcont[1]='Start::false:start:res'
-   objcont[2]='Finish::false:end:res';
    objlinks[0]='';
-   objlinks[1]='1:2:0';
-
+   if (((objcont[1]==undefined)&&(objcont[2]==undefined)) ||
+       ((objcont[1]=='')&&(objcont[2]==''))) { 
+      objcont[1]='Start::false:start:res'
+      objcont[2]='Finish::false:finish:res';
+   }
    graphdef='no';
 
 }
@@ -1633,7 +1789,7 @@ function tabledraw() {
   var cck;
   var condid;
   var sortstr=sortobjs();
- insrestab(1,-1,-1);
+ insrestab(1,-1,-1,'');
  if (sortstr!='') {
   objsorted=sortstr.split('&');
   for (k=0;k<objsorted.length;k++) {
@@ -1659,17 +1815,24 @@ function tabledraw() {
         +'"><form name=r'+i+' method=post>');
       data2=obj[i].split('&');
       parent.mapout.document.write('<table bgcolor="#CCCCCC">');
+      if (data1[3]=='start') { 
+         parent.mapout.document.writeln('<tr><td><b>Start</b></td></tr>');
+      }
+      if (data1[3]=='finish') { 
+         parent.mapout.document.writeln('<tr><td><b>Finish</b></td></tr>');
+      }
       parent.mapout.document.write(
        '<tr><td>Title:</td><td><input type=text name=t size=50 value="'
-                                   +data1[0]+'"></td></tr>');
+            +data1[0]+'"><input type=hidden name=h value='+data1[3]
+            +'></td></tr>');
+    if ((data1[3]!='start') && (data1[3]!='finish')) {
       parent.mapout.document.write(
        '<tr><td>URL:</td><td><input type=text name=u size=50 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 '+
+        +'<tr><td colspan=2><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'); }
@@ -1683,8 +1846,14 @@ function tabledraw() {
  '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.mapout.document.write('> Optional</td></tr>');
+    } else {
+     parent.mapout.document.write(
+       '<tr><td><input type=hidden name=u value="">'
+              +'<input type=hidden name=e value=false></td></tr>');
+    }
+     parent.mapout.document.write(
+         '<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
@@ -1694,17 +1863,22 @@ function tabledraw() {
         +';parent.code.draw();">'
         +'<b>Change to above values</b></a>&nbsp;&nbsp;'
         +' <a href="javascript:parent.mapout.document.forms.r'+i
-        +'.reset()">Reset</a></td></tr><tr><td colspan=2>'
-+'<A href="javascript:parent.code.notclear=0;parent.code.infoclear();'
+        +'.reset()">Reset</a></td></tr><tr><td colspan=2>');
+    if ((data1[3]!='start') && (data1[3]!='finish')) {
+     parent.mapout.document.writeln(
+ '<A href="javascript:parent.code.notclear=0;parent.code.infoclear();'
 +'parent.code.delres('+i+',0);parent.code.editmode=0;parent.code.draw();">'
 +'Delete Resource (cutting links)</A><br>'
 +'<A href="javascript:parent.code.notclear=0;parent.code.infoclear();'
 +'parent.code.delres('+i+',1);parent.code.editmode=0;parent.code.draw();">'
-+'Delete Resource (preserving links)</A><br>'
-       +'<a href="javascript:parent.code.linkmode='+i+
++'Delete Resource (preserving links)</A><br>');
+    }
+    if (data1[3]!='finish') {
+       parent.mapout.document.writeln(
+        '<a href="javascript:parent.code.linkmode='+i+
        ';parent.code.notclear=0;parent.code.infoclear();">'+
        'Link resource</a></td></tr>');
-
+    }
        parent.mapout.document.writeln('<tr><td colspan=2><table><tr>');
        for (j=2;j<data2.length;j++) {
            data4=data2[j].split(':');
@@ -1752,7 +1926,7 @@ function tabledraw() {
        }
        parent.mapout.document.writeln(
         '</tr></table></td></tr></table></form>');
-       insrestab(rrow[data2[1]],i,nr);
+       insrestab(rrow[data2[1]],i,nr,data1[3]);
 
    }
   }
@@ -1760,14 +1934,14 @@ function tabledraw() {
 
 // ----------------------------------------------------- Insert Resource Output
 
-function insrestab(irow,be,af) {
+function insrestab(irow,be,af,typ) {
   parent.mapout.document.writeln('<tr><td colspan=2>'+
        '<table><tr><td><a href="javascript:parent.code.insertrow('
        +irow+');parent.code.newresource(parent.code.maxrow,'+rcol[1]
  +",'','','false','normal');parent.code.mostrecent=parent.code.obj.length-1;"
        +'parent.code.draw();">'
        +'Insert resource</a></td><td>');
-  if (be!=-1) {
+  if ((be!=-1) && (typ!='finish')) {
    parent.mapout.document.writeln(
        '<a href="javascript:parent.code.insertrow('
        +irow+');parent.code.newresource(parent.code.maxrow,'+rcol[0]
@@ -1776,7 +1950,7 @@ function insrestab(irow,be,af) {
        +'parent.code.draw();">'
        +'Insert resource linked to from above</a><br>');
   }
-  if ((be!=-1) && (af!=-1)) {
+  if ((be!=-1) && (af!=-1) && (typ!='finish')) {
      parent.mapout.document.writeln(
        '<a href="javascript:parent.code.insertrow('
        +irow+');parent.code.newresource(parent.code.maxrow,'+rcol[0]
@@ -1832,6 +2006,12 @@ function simpletabledraw() {
         +'">');
       data2=obj[i].split('&');
       parent.mapout.document.write('<table>');
+      if (data1[3]=='start') { 
+         parent.mapout.document.writeln('<tr><td><b>Start</b></td></tr>');
+      }
+      if (data1[3]=='finish') { 
+         parent.mapout.document.writeln('<tr><td><b>Finish</b></td></tr>');
+      }
       parent.mapout.document.write(
        '<tr><td>Title:</td><td>'+data1[0]+'</td></tr>');
       parent.mapout.document.write(
@@ -1883,7 +2063,7 @@ function simpletabledraw() {
 // ---------------------------------- Sort objects to straighten graph or table
 
 function sortobjs() {
-   message("Sorting Resources");
+   message("Sorting Resources: "+funny);
    var k;
    var ij;
    var dol;
@@ -1901,6 +2081,8 @@ function sortobjs() {
    }
    if (objsort.length==0) { return ''; }
    for (k=1;k<objlinks.length;k++) {
+     wheelswitch();
+     message("Sorting Resources: "+funny);
      if (objlinks[k]!='') {
       sortthis=1;
       data1=objlinks[k].split(':');
@@ -1910,36 +2092,41 @@ function sortobjs() {
             kj=j;
          }
       }
-      objsort[kj]+=':'+data1[1];
+      if (kj!=-1) { objsort[kj]+=':'+data1[1]; }
      }
    }
    if (sortthis!=0) {
     for (k=0;k<objsort.length;k++) {
+      wheelswitch();
+      message("Sorting Resources: "+funny);
       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 (dol+dtl<200) {
+           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++) {
+           }
+           for (kj=1;kj<dtl;kj++) {
              if (data2[kj]==data1[0]) {
                  for (ij=1;ij<dol;ij++) {
-                   data2[data2.length]=data1[ij];
-                }
-            }
+                    data2[data2.length]=data1[ij];
+                 }
+             }
+           }
+           objsort[k]=data1.join(':');
+           objsort[j]=data2.join(':');
           }
-          objsort[k]=data1.join(':');
-          objsort[j]=data2.join(':');
          }
       } 
    }
+   message("Sorting Resources: finishing up.");
    return objsort.sort(rescompare).join('&');
   } else {
    return objsort.join('&');
@@ -1971,11 +2158,11 @@ function graphopt() {
          thiscolmax++;
       } else {
          rowcont[rowcont.length]=thisnewobj;
-         if (thiscolmax>allcolmax) { allcolmax=thiscolmax; }
          thiscolmax=1;
       }
       kj=rowcont.length-1;
-      obj[thisnewobj]='b&'+kj+'&'+thiscolmax+':0:0:0';   
+      obj[thisnewobj]='b&'+kj+'&'+thiscolmax+':0:0:0';
+      if (thiscolmax>allcolmax) { allcolmax=thiscolmax; }
    }
    for (k=0;k<obj.length;k++) {
        if (!obj[k]) { obj[k]=''; }
@@ -1985,23 +2172,30 @@ function graphopt() {
       row[k]=k;
    }
    maxrow=rowcont.length-1;
-
    var oldlinks=new Array();
-   for (k=0;k<objlinks.length;k++) { oldlinks[k]=objlinks[k]; }
+   for (k=0;k<objlinks.length;k++) { 
+      oldlinks[k]=objlinks[k]; 
+      objlinks[k]='';
+   }
    objlinks.length=0;
    objlinks[0]='';
+   graphdef='yes';
+   save();
+
    for (k=0;k<objsorted.length;k++) {
-      kj=(objsorted[k].split(':'))[0];
+     wheelswitch();
+     message("Connecting Resources: "+funny);
+     kj=(objsorted[k].split(':'))[0];
       for (ij=1;ij<oldlinks.length;ij++) {
         if (oldlinks[ij]) {
           data1=oldlinks[ij].split(':');
           if (data1[0]==kj) {
              joinres(data1[0],data1[1],data1[2]);
+             save();
           }
          }
       }
    }
-   graphdef='yes';
 }
 
 // ----------------------------------------------------------- Remove e-objects
@@ -2021,13 +2215,17 @@ function condense() {
       }
      }
    }
-   lastempty=-2;
 }
 
 // ---------------------------------------------------- Load from hidden fields
 
 function load() {
    message("Loading");
+   schedule('load');
+   checkdef();
+}
+
+function finishload() {
    var k;
    for (k=0;k<objcont.length;k++) { objcont[k]=''; }
    objcont.length=0;
@@ -2054,10 +2252,16 @@ 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]=='mode') { mode=data2[1]; }
        if (data2[0]=='tablemode') { tablemode=1*data2[1]; }
        if (data2[0]=='zscale') { zscale=1*data2[1]; }
    }
   }
+  if (graphdef=='yes') {
+     for (k=1;k<=maxrow;k++) {
+        if (rowcont[k]==undefined) { rowcont[k]=''; }
+     }
+  }
 }
 
 // -------------------------------------------------------------- Undo function
@@ -2067,7 +2271,7 @@ function undo() {
       undopointer--;
       parent.server.document.forms.storage.output.value
        =undostack[undopointer];
-      load();
+      finishload();
       undopointer--;
       draw();
       stored=0;
@@ -2083,7 +2287,7 @@ function redo() {
       undopointer++;
       parent.server.document.forms.storage.output.value
        =undostack[undopointer];
-      load();
+      finishload();
       undopointer--;
       draw();
       stored=0;
@@ -2101,12 +2305,80 @@ function revert() {
    }
 }
 
+// ---------------------------------------------------------------- Wheelswitch
+
+function wheelswitch() {
+   if (funny=='|') { 
+      funny='/'; 
+   } else {
+      if (funny=='/') {
+         funny='-';
+      } else {
+         if (funny=='-') { 
+            funny='\\'; 
+         } else {
+            if (funny=='\\') { funny='|'; }
+         }
+      }
+   } 
+}
+
+// --------------------------------------------- Checks if server frame defined
+
+function checkdef() {
+   if (parent.server.document.forms.storage.output.value!=undefined) {
+      srvloaded();
+   }
+   if ((finishdone==0) && (tim==0)) { setTimeout('checkdef()',100); }
+}
+
+// ---------------------------------------------------------- The wait function
+
+function wait() {
+   if ((finishdone==1) || (tim==1)) {
+      if (tim==0) {
+         clearTimeout(canceltim);
+         if (reqaction=='save') { finishsave(); }
+         if (reqaction=='load') { finishload(); draw(); }
+      } else {
+         alert("Server Communication Timed Out.");
+      }
+   } else {
+      wheelswitch();
+      message('Waiting for server reply: '+funny);
+      setTimeout('wait();',100);
+   }
+}
+
+// ---------------------------------------------------------- Schedule function
+
+function schedule(action) {
+   reqaction=action;
+   tim=0;
+   finishdone=0;
+   canceltim=setTimeout('tim=1;',20000)
+   wait();
+}
+
 // -------------------------------------------------------------- Store changes
 
 function storechange() {
+   var k;
    parent.server.document.forms.storage.submit();
+   schedule('save');
+}
+
+function finishsave() {
+   finishload();
+   draw();
    stored=1;
-   alert("Stored changes");   
+}
+
+// --------------------------------------- Gets called when submission finished
+
+function srvloaded() {
+   finishdone=1;
+   message("Server replied.");
 }
 
 // ---------------------------------------------------------------- Toggle Mode
@@ -2131,8 +2403,9 @@ function togglemode() {
 function main() {
 
    if (mainrun==0) {
+      infopen();
+      infoclear();
       load();
-      draw();
       stored=1;
       mainrun=1;
    }
@@ -2142,10 +2415,8 @@ function main() {
 // ------------------------------------------------------------- Save on leave?
 
 function leave() {
-   if (stored==0) {
-      if (confirm('Store changes?')) {
-         storechange();   
-      }
+   if (!inf.closed) {
+      inf.close();
    }
 }