--- rat/client/Attic/code.html	2000/05/04 21:05:28	1.2
+++ rat/client/Attic/code.html	2001/06/27 19:19:06	1.38
@@ -8,7 +8,14 @@ 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,5/25,
+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,
+01/17/01,03/03,03/05 Gerd Kortemeyer with Scott Harrison
+March/April 01 Scott Harrison
+04/20 Gerd Kortemeyer
+04/30 Scott Harrison
+05/31 Scott Harrison
+06/11,06/25,06/27 Gerd Kortemeyer
 -->
 
 
@@ -19,6 +26,7 @@ var row=new Array();
 var maxrow=-1;
 var col=new Array();
 var maxcol=-1;
+
 var colmap=new Array();
 var colmap2=new Array();
 var colmap3=new Array();
@@ -27,6 +35,7 @@ var colmap5=new Array();
 var colmap6=new Array();
 var obj=new Array();
 var objcont=new Array();
+var objparms=new Array();
 var objlinks=new Array();
 var rowcont=new Array();
 var rowtype=new Array();
@@ -44,8 +53,22 @@ var notclear=0;
 var linkmode=0;
 var lastinfo='';
 var graphdef='no';
+var mode='';
 var mainrun=0;
 var tablemode=0;
+var mostrecent=0;
+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);
@@ -53,12 +76,36 @@ var data3=new Array(1024);
 var data4=new Array(1024);
 var data5=new Array(1024);
 
+var inf;
+var srch;
+var srchflag=-1; // 1 means currently open
+                 // 0 means closed (but has been open)
+                 // -1 means never yet opened/defined
+var srchmode='';
+
+var idx;
+var idxflag=-1; // 1 means currently open
+                 // 0 means closed (but has been open)
+                 // -1 means never yet opened/defined
+var idxmode='';
+
+var parm;
+var parmflag=-1; // 1 means currently open
+                 // 0 means closed (but has been open)
+                 // -1 means never yet opened/defined
+                 
+var iconpath='/adm/lonIcons/';
+
+function testfunction() {
+   inf.document.forms.resinfo.elements.t.value="ABC";
+}
 
 // ------------------------------------------------ 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++) {
@@ -73,7 +120,7 @@ function insertrow(j,ex1,ex2) {
    objects=objects1+':'+objects2;
    data1=objects.split(':');
    for (kj=0;kj<data1.length;kj++) {
-     if (data1[kj]!='') {
+     if ((data1[kj]!='') && (data1[kj]!=undefined)) {
        thisisobj=obj[data1[kj]];
        thisobjtype=thisisobj.split('&')[0];
        if (thisobjtype=='v') {
@@ -114,7 +161,7 @@ function insertrow(j,ex1,ex2) {
                    }
                 }
              }
-             if (newobj!='') {
+             if ((newobj!='') && (newobj!=undefined)) {
                 thisobjcol=newobj.split('&')[1];
                 if (colcover.indexOf(':'+thisobjcol+':',0)==-1) {
                    colcover+=thisobjcol+':';  
@@ -140,7 +187,7 @@ function insertrow(j,ex1,ex2) {
                    }
                 }
              }
-             if (newobj!='') {
+             if ((newobj!='') && (newobj!=undefined)) {
                 thisobjcol=newobj.split('&')[1];
                 if (colcover.indexOf(':'+thisobjcol+':',0)==-1) {
                    colcover+=thisobjcol+':';  
@@ -171,9 +218,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';
 }
 
 
@@ -203,6 +251,7 @@ function insertcol(j) {
       if ( col[kj]>j ) { col[kj]++; } 
    }
    maxcol++;
+   expense++; expense++;
    col[maxcol]=j+1;
 }
      
@@ -235,7 +284,7 @@ function maprow (jid,obj1,ign) {
  var j; var k; var left; var right; var middle;
  middle=-1;
  for (j=0;j<=maxcol;j++) { colmap[j]=0; }
- if (rowcont[jid]!='') {
+ if ((rowcont[jid]!='') && (rowcont[jid]!=undefined)) {
    data2=rowcont[jid].split(':');
    for (j=0;j<data2.length;j++) {
       data3=obj[data2[j]].split('&');
@@ -326,7 +375,6 @@ function comingthru (jid,kid,dkid) {
 
 function insertport (obj1,d,inout,linkobj) {
 
-
    var k; var port; var revport;
    stored=0;
    data1=obj[obj1].split('&');
@@ -405,7 +453,10 @@ function insertport (obj1,d,inout,linkob
  
 function addobj(kjid,objs) {
    stored=0;
-   if (rowcont[kjid]!='') { rowcont[kjid]+=':'; }
+   expense++;
+   if ((rowcont[kjid]!='') && (rowcont[kjid]!=undefined)) { 
+      rowcont[kjid]+=':'; 
+   }
    rowcont[kjid]+=obj.length;
    obj[obj.length]=objs;
    return obj.length-1;
@@ -459,24 +510,29 @@ function delobj(obj1) {
       rowcont[k]='';
       for (k2=0;k2<data4.length;k2++) {
          if (data4[k2]!=obj1) {
-            if (rowcont[k]!='') { rowcont[k]+=':'; } 
+            if ((rowcont[k]!='') && (rowcont[k]!=undefined)) { 
+               rowcont[k]+=':'; 
+            } 
             rowcont[k]+=data4[k2]; 
          }
       }
    }
+   obj[obj1]='';
 }
 
 // --------------------------------------------------------- Garbage collection
 
 function cleanup () {
+   message("Garbage Collection");
    var j,kj,i;
-   insertrow(maxrow);
-   insertcol(maxcol);
-   addobj(maxrow,'e&'+maxcol);
+   disrows=0;
+   discols=0;
+   var emptyspots=0;
+
    for (kj=0;kj<=maxcol;kj++) { data1[kj]=0; }
    for (kj=0;kj<=maxrow;kj++) {
      rowtype[kj]=0;
-     if (rowcont[kj]!='') {
+     if ((rowcont[kj]!='') && (rowcont[kj]!=undefined)) {
        data2=rowcont[kj].split(':');
        for (j=0;j<data2.length;j++) {
          if (obj[data2[j]].substring(0,2)=='e&') {
@@ -495,6 +551,7 @@ function cleanup () {
               }
               if (obj[colmap[j]].substring(0,2)=='b&') { 
                  data1[j]=2;
+                 if (colmap[maxcol]==0) { emptyspots++; }
                  rowtype[kj]=2;
               }  
            }
@@ -502,8 +559,23 @@ 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; }
    }
+   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
@@ -515,13 +587,17 @@ function delcond(obj1,colid) {
    obj[obj1]=data3[0]+'&'+data3[1];
    for (k=2;k<data3.length;k++) {
       data4=data3[k].split(':');
-      if (data4[0]==colid) { data4[3]=0; }
+      if (data4[0]==colid) { 
+         data4[3]=0; 
+         objlinks[data4[2]]=(objlinks[data4[2]].split(':'))[0]+':'+
+                            (objlinks[data4[2]].split(':'))[1]+':0';
+      }
       if ((data4[1]!=0) || (data4[2]!=0) || (data3.length==3)) {
          obj[obj1]+='&'+data4[0]+':'+data4[1]+':'+data4[2]+':'+data4[3];
       }
    }
 }
-
+    
 // ----------------------------------------- Creates a new condition in a block
 
 function crecond(obj1,colid,condtext,condtype) {
@@ -549,7 +625,7 @@ function crecond(obj1,colid,condtext,con
 function dellink (linknr) {
   var k; var obj1; var obj2;
   stored=0;
-  if (objlinks[linknr]!='') {
+  if ((objlinks[linknr]!='') && (objlinks[linknr]!=undefined)) {
    data3=objlinks[linknr].split(':');
    obj1=data3[0];
    obj2=data3[1];
@@ -572,7 +648,7 @@ function dellink (linknr) {
       }
    }
    for (k=0;k<obj.length;k++) {
-     if (obj[k]!='') {
+     if ((obj[k]!='') && (obj[k]!=undefined)) {
        data3=obj[k].split('&');
        if (((data3[0]=='v') || (data3[0]=='h')) && 
            (data3[data3.length-2]==linknr)) {
@@ -588,22 +664,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);
    }
@@ -731,15 +850,19 @@ 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;
             for (k2=0;k2<inobjs.length;k2++) {
                if (inobjs[k2]==infromobj[k]) {
                   if (inwithcon[k]!=0) {
-                     if (inobjscond[k2]!='') { inobjscond[k2]+='||'; }
+                     if ((inobjscond[k2]!='') &&
+                         (inobjscond[k2]!=undefined)) { 
+                         inobjscond[k2]+='||'; 
+                     }
                      inobjscond[k2]+=
                       '('+(objcont[inwithcon[k]].split(':'))[0]+')';
                    }
@@ -765,7 +888,10 @@ function delres (obj1,recon) {
             for (k2=0;k2<outobjs.length;k2++) {
                if (outobjs[k2]==outtoobj[k]) {
                  if (outwithcon[k]!=0) {
-                     if (outobjscond[k2]!='') { outobjscond[k2]+='||'; }
+                     if ((outobjscond[k2]!='') &&
+                         (outobjscond[k2]!=undefined)) { 
+                         outobjscond[k2]+='||'; 
+                     }
                      outobjscond[k2]+=
                       '('+(objcont[outwithcon[k]].split(':'))[0]+')';
                   }
@@ -787,15 +913,22 @@ function delres (obj1,recon) {
 
       for (k=0;k<inobjs.length;k++) {
           cond='';
-          if (inobjscond[k]!='') { cond='('+inobjscond[k]+')'; }
+          if ((inobjscond[k]!='') && (inobjscond[k]!=undefined)) { 
+             cond='('+inobjscond[k]+')'; 
+          }
           for (k2=0;k2<outobjs.length;k2++) {
               thiscond=cond;
-              if (outobjscond[k2]!='') {
-                 if (thiscond!='') { thiscond+='&&'; }
+              if ((outobjscond[k2]!='') && (outobjscond[k2]!=undefined)) {
+                 if ((thiscond!='') && (thiscond!=undefined)) { 
+                    thiscond+='&&'; 
+                 }
                  thiscond+='('+outobjscond[k2]+')';
               }
               condnr=0;
-              if (thiscond!='') { condnr=newcondition(thiscond,'normal'); } 
+              if ((thiscond!='') && (thiscond!=undefined)) { 
+                 condnr=newcondition(thiscond,'normal'); 
+              }
+              save(); 
               joinres(inobjs[k],outobjs[k2],condnr);
           }
       }
@@ -806,28 +939,62 @@ function delres (obj1,recon) {
 
 function drawcell (rtype,ctype,what,cm,obj1,ej,ek,ne) {
  var bgcolor;
+ var url='';
+ var urlparts=new Array;
+ var mimetype;
+ var objref;
+
+ if ((what=='') && (ne==0)) { cm="#DDDDDD"; }
  if (ctype!=0) {
    parent.mapout.document.write('<td bgcolor='+cm+' width='+cw[ctype]+'>');
-   if (what!='') {
-     if (obj1!='') {
-       obj1="'"+obj1+"'";
+   if ((what!='') && (what!=undefined)) {
+     if ((obj1!='') && (obj1!=undefined)) {
+       objref="'"+obj1+"'";
        parent.mapout.document.write
-        ('<a href="javascript:parent.code.handler('+obj1
-         +');" onMouseOver="parent.code.info('+obj1+');">');
+        ('<a href="javascript:parent.code.handler('+objref
+         +');" onMouseOver="parent.code.info('+objref+');">');
      } 
      if (what=='r:') {
+        mime='';
+        if (objcont[obj1]!=undefined) {
+            urlparts=objcont[obj1].split(':');
+            url=urlparts[1];
+            urlparts=url.split('.',$url);
+            mime=urlparts[urlparts.length-1];
+            if (mime==undefined) { mime=''; }
+        }
         parent.mapout.document.write
-         ('<img border=0 src="resource.gif">');
+         ('<img border=0 width='+cw[ctype]+' height='+rh[1]
+          +' src="resource.gif">');
+        if (mime!='') {
+           parent.mapout.document.write
+           ('</a><br><a target="preview" href="'+url+
+           '"><img border=0 src="'+iconpath+mime+'.gif">');
+        }
      } else {
         if (what=='c:') {
            parent.mapout.document.write
-            ('<img border=0 src="condition.gif">');          
+            ('<img border=0 width='+cw[ctype]+' height='+rh[rtype]
+             +' src="condition.gif">');          
         } else {
-           parent.mapout.document.write
-            ('<img border=0 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!='') {
+     if ((obj1!='') && (obj1!=undefined)) {
        parent.mapout.document.write('</a>');
      }
    } else {
@@ -841,16 +1008,37 @@ function drawcell (rtype,ctype,what,cm,o
       parent.mapout.document.write
          ('onMouseOver="parent.code.infoclear();">');
       parent.mapout.document.write
-         ('<img border=0 src="'+rtype+'.'+ctype+'.empty.gif"></a>');
+         (
+         '<img border=0 width='+cw[ctype]+' height='+rh[rtype]
+        +' src="'+rtype+'.'+ctype+'.empty.gif"></a>');
    }
    parent.mapout.document.write('</td>');
  }
 }
 
+// --------------------------------------------------------- Color of resources
+
+function rescolor (ext,typ) {
+   var rc; var gc; var bc;
+   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=='finish')) { rc='AA'; gc='AA'; bc='FF'; }
+   return '#'+rc+gc+bc;
+}
+
+// -------------------------------------------------------- Color of conditions
+
+function condcolor(typ) {
+   if (typ=='stop')  { return '#EEAAAA'; }
+   if (typ=='force') { return '#AAAAEE'; }
+   return '#EEEEAA';
+}
+
 // ----------------------------------------------------------------- Draw a row
 
 function drawrow (jid) {
-var j; var jk; var k; var rc; var gc; var bc; var ck;
+var j; var jk; var k;  var ck; var rtype;
 var objd1=new Array();
 var objd2=new Array();
 var notempty=new Array();
@@ -858,19 +1046,19 @@ 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]!='') {
+ if ((rowcont[jid]!='') && (rowcont[jid]!=undefined)) {
    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);
-         ck='#'+rc+gc+bc;
+         data1=objcont[data2[jk]].split(':');
+         rtype=data1[3];
+         ck=rescolor(data1[2],data1[3]);
          left=maxcol;
          leftin=maxcol;
          leftout=maxcol;
@@ -894,9 +1082,7 @@ if (rowtype[jid]!=0) {
                if (data1[3]!=0) {
                   colmap3[thiscol]='c:';
                   condtype=(objcont[data1[3]].split(':'))[1];
-                  colmap6[thiscol]='#FFFFAA';
-                  if (condtype=='stop')  { colmap6[thiscol]='#FFAAAA'; }
-                  if (condtype=='force') { colmap6[thiscol]='#AAAAFF'; }
+                  colmap6[thiscol]=condcolor(condtype);
                   objd2[thiscol]='c&'
                        +data1[0]+'&'+data2[jk]+'&'+data1[2]+'&'+data1[3];
                } else {
@@ -909,12 +1095,20 @@ 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) {
             for (k=middle+1;k<rightin;k++) { 
-               if (colmap4[k]!='') {
+               if ((colmap4[k]!='') && (colmap4[k]!=undefined)) {
                   colmap[k]='rlt'; 
                } else {
                   colmap[k]='rl';
@@ -924,7 +1118,7 @@ if (rowtype[jid]!=0) {
          }
          if (leftin<middle) {
             for (k=middle-1;k>leftin;k--) { 
-               if (colmap4[k]!='') {
+               if ((colmap4[k]!='') && (colmap4[k]!=undefined)) {
                   colmap[k]='lrt'; 
                } else {
                   colmap[k]='lr';
@@ -944,7 +1138,7 @@ if (rowtype[jid]!=0) {
             if (rightout<middle)  { colmap2[middle]='tl'; }
             if (rightout==middle) { colmap2[middle]='tdl'; }
             if (rightout>middle)  { 
-              if (colmap3[middle]!='') {
+              if ((colmap3[middle]!='') && (colmap3[middle]!=undefined)) {
                  colmap2[middle]='rtdl'; 
               } else {
                  colmap2[middle]='rtl';
@@ -953,7 +1147,7 @@ if (rowtype[jid]!=0) {
          }
          if (leftout<middle) {
             for (k=middle-1;k>leftout;k--) { 
-               if (colmap3[k]!='') {
+               if ((colmap3[k]!='') && (colmap3[k]!=undefined)) {
                   colmap2[k]='rld'; 
                } else {
                   colmap2[k]='rl';
@@ -963,7 +1157,7 @@ if (rowtype[jid]!=0) {
          }
          if (rightout>middle) {
             for (k=middle+1;k<rightout;k++) { 
-               if (colmap3[k]!='') {
+               if ((colmap3[k]!='') && (colmap3[k]!=undefined)) {
                   colmap2[k]='lrd'; 
                } else {
                   colmap2[k]='lr';
@@ -988,7 +1182,10 @@ if (rowtype[jid]!=0) {
          } else {
             colmap[left]='rd'; colmap2[left]='utd'; colmap3[left]='utd';   
          }
+         notempty[left]=1;
+         notempty[right]=1;
          for (k=left+1;k<right;k++) { 
+            notempty[k]=1;
             if (colmap[k]=='') {
                colmap[k]=thisarrow; 
                objd1[k]=data2[jk];
@@ -1009,7 +1206,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 +1221,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='+rh[1]+'>');
       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='+rh[1]+'>');
       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 +1239,12 @@ if (rowtype[jid]!=0) {
 }
 }
 
+// -------------------------------------------------------------- Print message
+
+function message(txt) {
+   parent.window.status=txt;
+}
+
 // ------------------------------------------------------------- Draw the table
          
 function draw () {
@@ -1046,23 +1253,38 @@ 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;
+   rh[1]=zscale*10;
+   rh[2]=zscale*20;
    cw[0]=0;
-   cw[1]=30;
-   cw[2]=60;
+   cw[1]=zscale*10;
+   cw[2]=zscale*20;
+
    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");
+      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>');
+      if (tablemode==1) {
+         tabledraw();
+      } else {
+         simpletabledraw();
+      }
    } 
 
    parent.mapout.document.writeln('</table>');
@@ -1076,34 +1298,74 @@ 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>'+
     '<img src="/adm/lonIcons/lonlogos.gif"></td>');
   if (linkmode!=0) {
+   if (tablemode==0) {
      inf.document.writeln(
       '<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>Link Mode</b><hr>Click on a resource number to link it with<br><b>'+
+     (objcont[linkmode].split(':'))[0]+'</b><br>'+
+'<a href="javascript:opener.linkmode=0;opener.notclear=0;opener.infoclear();">'
+   +'Cancel</a></td>');
+   }
+  } else {
+   if (tablemode==0) {
+      inf.document.writeln(
+        '<td><b>Click to Edit</b><hr>Click in a light gray area<br>'
+       +'to insert resources, columns and rows</td>'
+      );
+   }
   }
   inf.document.writeln('</tr></table></body></html>');
   inf.document.close();
-  parent.focus();
+  if (srchflag==1) {
+    srchclose();
+  }
+  if (idxflag==1) {
+    idxclose();
+  }
+  if (parmflag==1) {
+    parmclose();
+  }
+  parent.top.focus();
   parent.mapout.focus();
   notclear=1;
   lastinfo='';
  }
 }
 
+// ------------------------------------------------------------ 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) {
+ var mime='';
+ var urlparts=new Array;
+ var url='';
  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">'+
@@ -1130,9 +1392,34 @@ 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>');
+        url=data2[1];
+        urlparts=url.split('.');
+        mime=urlparts[urlparts.length-1];
+        if (mime==undefined) { mime=''; }
+        if (mime!='') {
+           inf.document.write
+           ('<br><a target="preview" align="right" href="'+url+
+           '"><img border=0 src="'+iconpath+mime+'.gif"></a>');
+        }
+       inf.document.write('<b>');
+        if (data2[2]=='true') { inf.document.write('External '); }
+        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)');
+        }
+        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>');
@@ -1153,7 +1440,7 @@ function info(infostr) {
   }
   inf.document.writeln('</td></tr></table></body></html>');
   inf.document.close();
-  parent.focus();
+  parent.top.focus();
   parent.mapout.focus();
   notclear=0;
   lastinfo=infostr;
@@ -1180,7 +1467,148 @@ function escape(instring) {
 // -------------------------------------------------- Insert resource into link
 
 function insertreslink(infostr) {
-   alert(infostr);
+   var lnr;
+   var fobj;
+   var tobj;
+   var nobj;
+   var cobj;
+   var cid;
+   var rid;
+   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;
+   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);
+}
+
+
+
+
+// ------------------------------------------------------ Clears indexer window
+
+function idxclear() {
+  idx.document.clear();
+}
+
+// ------------------------------------------------------- Clears search window
+
+function srchclear() {
+  srch.document.clear();
+}
+
+// --------------------------------------------------------- Clears parm window
+
+function parmclear() {
+  parm.document.clear();
+}
+
+// ------------------------------------------------------ Closes indexer window
+
+function idxclose() {
+  if (idx && !idx.closed) {
+    idxflag=0;
+    idx.close();
+  }
+}
+
+// ------------------------------------------------------- Closes search window
+
+function srchclose() {
+  if (srch && !srch.closed) {
+    srchflag=0;
+    srch.close();
+  }
+}
+
+// ------------------------------------------------------- Closes search window
+
+function parmclose() {
+  if (parm && !parm.closed) {
+    parmflag=0;
+    parm.close();
+  }
+}
+
+// -------------------------------------------------------- Open indexer window
+
+function idxopen(mode) {
+   var options="scrollbars=1,resizable=1,menubar=0";
+   idxmode=mode;
+   idxflag=1;
+   idx=open("/res?catalogmode="+mode,"idxout",options);
+   idx.focus();
+}
+
+// --------------------------------------------------------- Open search window
+
+function srchopen(mode) {
+   var options="scrollbars=1,resizable=1,menubar=0";
+   srchmode=mode;
+   srchflag=1;
+   srch=open("/adm/searchcat?catalogmode=interactive","srchout",options);
+   srch.focus();
+}
+
+// -------------------------------------------- Interface function to searching
+
+function search() {
+   alert("Searching not yet implemented");
+}
+
+// ------------------------------------------------------- Do srch status check
+
+function srchcheck(mode) {
+   if (!srch || srch.closed || srchmode!=mode) {
+      srchopen();
+   }
+   srch.focus();
+}
+
+// -------------------------------------------------------- Do idx status check
+
+function idxcheck(mode) {
+   if (!idx || idx.closed || idxmode!=mode) {
+      idxopen(mode);
+   }
+   idx.focus();
 }
 
 // ---------------------------------------------------- Handles "click to edit"
@@ -1189,8 +1617,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">'+
@@ -1205,7 +1632,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 +1658,26 @@ 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>');
+
+        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) {
         joinres(linkmode,data1[1],0);
@@ -1250,25 +1687,55 @@ 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=40 value="'
-        +data2[0]+'"></td></tr><tr><td>URL:</td><td>'
-        +'<input type=text name=u size=40 value="'+data2[1]+'"></td></tr>'
+         '<form name=resinfo><table><tr><td>Title:</td><td colspan=2>'
+        +'<input type=text name=t size=30 value="'
+        +data2[0]+'"><input type=hidden name=h value='+data2[3]+'></td></tr>');
+           inf.document.write('<tr><td>URL:</td><td colspan=2>'
+        +'<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>'
-        +'<tr><td colspan=2><a href="javascript:opener.editmode=0;'
+        inf.document.write('></td><td align=right>'
+        +'<a href="javascript:opener.idxcheck(\'interactive\')">Browse</a> '
+        +'<a href="javascript:opener'
+	+'.srchcheck(\'interactive\')">Search</a></td></tr>');
+    if ((data2[3]!='start') && (data2[3]!='finish')) {
+        inf.document.write('<tr><td colspan=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>');
+    } 
+        inf.document.writeln(
+         '<tr><td colspan=3><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>');
+    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('
@@ -1277,14 +1744,22 @@ 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>');
+    }
+        inf.document.writeln(
+          '<br><a href="javascript:'
+         +'opener.setparms('+data1[1]+');'
+         +'opener.infoclear();">Set Parameters</a>');
+    
       }
      } 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 +1769,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 +1777,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();
 }
@@ -1317,8 +1792,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">'+
@@ -1326,9 +1800,30 @@ 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]!='') && 
+                         (objcont[mostrecent]!=undefined)) {
+
+        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 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</a>');
+          +');">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,9 +1855,10 @@ 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++) {
+   for (k=1;k<obj.length;k++) {
          parent.server.document.forms.storage.output.value+=
           '<&>obj<:>'+k+'<:>'+obj[k];
    }
@@ -1384,7 +1880,20 @@ function save() {
       '<&>maxcol<:>'+maxcol; 
    parent.server.document.forms.storage.output.value+=
       '<&>maxrow<:>'+maxrow;
-
+    parent.server.document.forms.storage.output.value+=
+      '<&>zscale<:>'+zscale;
+} else {
+   parent.server.document.forms.storage.output.value='graphdef<:>no';
+ }
+ parent.server.document.forms.storage.output.value+=
+   '<&>tablemode<:>'+tablemode;
+      
+   for (k=0;k<objparms.length;k++) {
+      if (objparms[k]) {
+         parent.server.document.forms.storage.output.value+=
+          '<&>objparms<:>'+k+'<:>'+objparms[k];
+      }
+   }  
    for (k=0;k<objcont.length;k++) {
       if (objcont[k]) {
          parent.server.document.forms.storage.output.value+=
@@ -1406,24 +1915,31 @@ function save() {
 
 function graphreset() {
 
+   var k;
+
+   for (k=0;k<obj.length;k++) { obj[k]=''; }
    obj.length=0;
    obj[0]='';
-   obj[1]='e&1';
 
    rowcont.length=0;
    rowcont[0]='';
-   rowcont[1]='1';
+
    row.length=0;
    row[0]=0;
-   row[1]=1;
-   maxrow=1;
+   maxrow=0;
 
    col.length=0;
    colmap.length=0;
    maxcol=-1;
    insertcol(-1);
-   insertcol(0);
 
+   objcont[0]='';
+   objlinks[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';
 
 }
@@ -1442,53 +1958,334 @@ 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 k;
-   var ij;
-   var kj;
-   var objsort=new Array();
-   var objsorted=new Array();
-   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];
+  var objsorted=new Array();
+  var robjs=new Array();
+  var iobjs=new Array();
+  var k;
+  var i;
+  var j;
+  var nr;
+  var ck;
+  var cck;
+  var condid;
+  var url='';
+  var mime='';
+  var urlparts=new Array;
+  var sortstr=sortobjs();
+ insrestab(1,-1,-1,'');
+ if ((sortstr!='') && (sortstr!=undefined)) {
+  objsorted=sortstr.split('&');
+  for (k=0;k<objsorted.length;k++) {
+     i=(objsorted[k].split(':'))[0];
+     iobjs[k]=i;
+     robjs[i]=k;
+  }
+  for (k=0;k<iobjs.length;k++) {
+       i=iobjs[k];
+       if (k<objsorted.length-1) {
+          nr=iobjs[k+1];
+       } else {
+          nr=-1;
+       }
+       data1=objcont[i].split(':');
+       ck=rescolor(data1[2],data1[3]);
+        parent.mapout.document.write('<tr><td bgcolor="'+ck+'">');
+        url=data1[1];
+        urlparts=url.split('.');
+        mime=urlparts[urlparts.length-1];
+        if (mime==undefined) { mime=''; }
+        if (mime!='') {
+           parent.mapout.document.write
+           ('<a target="preview" align="right"href="'+url+
+           '"><img src="'+iconpath+mime+'.gif"></a><p>');
+        }
+         parent.mapout.document.write(
+         '<b><a href="javascript:if (parent.code.linkmode!=0) { '
+        +'parent.code.joinres(parent.code.linkmode,'+i+',0);'
+        +'parent.code.linkmode=0;parent.code.editmode=0;'
+        +'parent.code.notclear=0;parent.code.infoclear();'
+        +'parent.code.draw(); }">'+k+'</a></b></td><td bgcolor="'+ck
+        +'"><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]+'"><input type=hidden name=h value='+data1[3]
+            +'></td></tr>');
+      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>');
+    if ((data1[3]!='start') && (data1[3]!='finish')) {
+        parent.mapout.document.write(
+        '<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'); }
+     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>');
+    } 
+     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
+        +'.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></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>');
+    }
+    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>');
+    }
+        parent.mapout.document.writeln(
+          '<br><a href="javascript:'
+         +'parent.code.setparms('+i+');">Set Parameters</a>');
+
+      parent.mapout.document.writeln('</td></tr>');
+       parent.mapout.document.writeln('<tr><td colspan=2><table><tr>');
+       for (j=2;j<data2.length;j++) {
+           data4=data2[j].split(':');
+           data3=objlinks[data4[2]].split(':');
+           if (data3.length>1) {
+              if (data3[1]==nr) {
+                 cck='#AAAAAA';
+                 if (data3[2]!=0) { 
+                   cck=condcolor((objcont[data3[2]].split(':'))[1]);
+                   condid=data3[2];
+                 } else {
+                   condid='-';
+                 }                 
+                 parent.mapout.document.writeln(
+                  '<td bgcolor='+cck+'>Next<br>');
+                 parent.mapout.document.writeln(
+                  '<a href="javascript:parent.code.handler('+
+                  "'c&"+data4[0]+'&'+i+'&'+data4[2]+'&'+condid+"');"
+                  +'">Edit</a>');
+                 parent.mapout.document.writeln('</td>');
+              }
+           }
+       }
+       for (j=2;j<data2.length;j++) {
+           data4=data2[j].split(':');
+           data3=objlinks[data4[2]].split(':');
+           if (data3.length>1) {
+              if ((data3[1]!=nr) && (data3[1]!=0)) {
+                 cck='#AAAAAA';
+                 if (data3[2]!=0) { 
+                   cck=condcolor((objcont[data3[2]].split(':'))[1]);
+                   condid=data3[2];
+                 } else {
+                   condid='-';
+                 }
+                 parent.mapout.document.writeln(
+                  '<td bgcolor='+cck+'>To: '+robjs[data3[1]]+'<br>');
+                 parent.mapout.document.writeln(
+                  '<a href="javascript:parent.code.handler('+
+                  "'c&"+data4[0]+'&'+i+'&'+data4[2]+'&'+condid+"');"
+                  +'">Edit</a>');
+                 parent.mapout.document.writeln('</td>');
+              }
+           }
+       }
+       parent.mapout.document.writeln(
+        '</tr></table></td></tr></table></form>');
+       insrestab(rrow[data2[1]],i,nr,data1[3]);
+
    }
-   objsorted=objsort.sort(rescompare);
-   for (ij=0;ij<objsorted.length;ij++) {
-      
+  }
+}
+
+// ----------------------------------------------------- Insert Resource Output
+
+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) && (typ!='finish')) {
+   parent.mapout.document.writeln(
+       '<a href="javascript:parent.code.insertrow('
+       +irow+');parent.code.newresource(parent.code.maxrow,'+rcol[0]
+ +",'','','false','normal');parent.code.mostrecent=parent.code.obj.length-1;"
+       +"parent.code.save();"
+       +'parent.code.joinres('+be+',parent.code.mostrecent,0);'
+       +'parent.code.draw();">'
+       +'Insert resource linked to from above</a><br>');
+  }
+  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]
+ +",'','','false','normal');parent.code.mostrecent=parent.code.obj.length-1;"
+       +"parent.code.save();"
+       +'parent.code.joinres('+be+',parent.code.mostrecent,0);'
+       +"parent.code.save();"
+       +'parent.code.joinres(parent.code.mostrecent,'+af+',0);'
+       +'parent.code.draw();">'
+       +'Insert resource linked to from above and linking to below</a><br>');
+  }
+  if (af!=-1) {
+     parent.mapout.document.writeln(
+       '<a href="javascript:parent.code.insertrow('
+       +irow+');parent.code.newresource(parent.code.maxrow,'+rcol[0]
+ +",'','','false','normal');parent.code.mostrecent=parent.code.obj.length-1;"
+       +"parent.code.save();"
+       +'parent.code.joinres(parent.code.mostrecent,'+af+',0);'
+       +'parent.code.draw();">'
+       +'Insert resource linking to below</a><br>');
+  }
+  parent.mapout.document.writeln('</td></tr></table></tr>');
+}
+// ---------------------------------------- Draw simple table instead of graph
+
+function simpletabledraw() {
+  var objsorted=new Array();
+  var robjs=new Array();
+  var iobjs=new Array();
+  var k;
+  var i;
+  var j;
+  var nr;
+  var ck;
+  var cck;
+  var condid;
+  var sortstr=sortobjs();
+ if ((sortstr!='') && (sortstr!=undefined)) {
+  objsorted=sortstr.split('&');
+  for (k=0;k<objsorted.length;k++) {
+     i=(objsorted[k].split(':'))[0];
+     iobjs[k]=i;
+     robjs[i]=k;
+  }
+  for (k=0;k<iobjs.length;k++) {
+       i=iobjs[k];
+       if (k<objsorted.length-1) {
+          nr=iobjs[k+1];
+       } else {
+          nr=-1;
+       }
+       data1=objcont[i].split(':');
+       ck=rescolor(data1[2],data1[3]);
+        parent.mapout.document.write('<tr><td bgcolor="'+ck+'">');
+        url=data1[1];
+        urlparts=url.split('.');
+        mime=urlparts[urlparts.length-1];
+        if (mime==undefined) { mime=''; }
+        if (mime!='') {
+           parent.mapout.document.write
+           ('<a target="preview" align="right"href="'+url+
+           '"><img src="'+iconpath+mime+'.gif"></a><p>');
+        }        
+      parent.mapout.document.write('<b>'+k+'</b></td><td bgcolor="'+ck+'">');
+      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(
+       '<tr><td>URL:</td><td>'+data1[1]+'</td></tr>'
+      +'<tr><td colspan=2><table><tr>');
+       for (j=2;j<data2.length;j++) {
+           data4=data2[j].split(':');
+           data3=objlinks[data4[2]].split(':');
+           if (data3.length>1) {
+              if (data3[1]==nr) {
+                 cck='#AAAAAA';
+                 if (data3[2]!=0) { 
+                   cck=condcolor((objcont[data3[2]].split(':'))[1]);
+                   condid=data3[2];
+                 } else {
+                   condid='-';
+                 }                 
+                 parent.mapout.document.writeln(
+                  '<td bgcolor='+cck+'>Next<br>');
+                  parent.mapout.document.writeln('</td>');
+              }
+           }
+       }
+       for (j=2;j<data2.length;j++) {
+           data4=data2[j].split(':');
+           data3=objlinks[data4[2]].split(':');
+           if (data3.length>1) {
+              if ((data3[1]!=nr) && (data3[1]!=0)) {
+                 cck='#AAAAAA';
+                 if (data3[2]!=0) { 
+                   cck=condcolor((objcont[data3[2]].split(':'))[1]);
+                   condid=data3[2];
+                 } else {
+                   condid='-';
+                 }
+                 parent.mapout.document.writeln(
+                  '<td bgcolor='+cck+'>To: '+robjs[data3[1]]+'<br>');
+                 parent.mapout.document.writeln('</td>');
+              }
+           }
+       }
+       parent.mapout.document.writeln('</tr></table></td></tr></table></tr>');
    }
-   alert("Table mode not yet implemented");
+  } else {
+    parent.mapout.document.writeln('<tr><td>No Resources</td></tr>');
+  }
 }
 
-// ------------------------------------------- Sort objects to straighten graph
+// ---------------------------------- Sort objects to straighten graph or table
 
-function graphopt() {
+function sortobjs() {
+   message("Sorting Resources: "+funny);
    var k;
    var ij;
+   var dol;
+   var dtl;
    var kj;
+   var sortthis=0;
    var objsort=new Array();
-   var objsorted=new Array();
-   condense();
-   graphreset();
    for (k=1;k<objcont.length;k++) {
       if (objcont[k]) {
          data1=objcont[k].split(':');
@@ -1497,7 +2294,12 @@ function graphopt() {
          }
       }
    }
+   if (objsort.length==0) { return ''; }
    for (k=1;k<objlinks.length;k++) {
+     wheelswitch();
+     message("Sorting Resources: "+funny);
+     if ((objlinks[k]!=undefined) && (objlinks[k]!='')) {
+      sortthis=1;
       data1=objlinks[k].split(':');
       kj=-1;
       for (j=0;j<objsort.length;j++) {
@@ -1505,9 +2307,60 @@ function graphopt() {
             kj=j;
          }
       }
-      objsort[kj]+=':'+data1[1];
+      if (kj!=-1) { objsort[kj]+=':'+data1[1]; }
+     }
    }
-   objsorted=objsort.sort(rescompare);
+   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;
+          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++) {
+             if (data2[kj]==data1[0]) {
+                 for (ij=1;ij<dol;ij++) {
+                    data2[data2.length]=data1[ij];
+                 }
+             }
+           }
+           objsort[k]=data1.join(':');
+           objsort[j]=data2.join(':');
+          }
+         }
+      } 
+   }
+   message("Sorting Resources: finishing up.");
+   return objsort.sort(rescompare).join('&');
+  } else {
+   return objsort.join('&');
+  }
+}
+
+// ----------------------------------------------------------- Straighten graph
+
+function graphopt() {
+  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;
@@ -1520,11 +2373,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]=''; }
@@ -1534,18 +2387,26 @@ 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();
           }
          }
       }
@@ -1555,14 +2416,17 @@ function graphopt() {
 // ----------------------------------------------------------- Remove e-objects
 
 function condense() {
+   message("Condensing");
    var j;
    for (j=0;j<=maxrow;j++) {
-     if (rowcont[j]!='') {
+     if ((rowcont[j]!='') && (rowcont[j]!=undefined)) {
       data1=rowcont[j].split(':');
       rowcont[j]='';
       for (k=0;k<data1.length;k++) {
          if (obj[data1[k]].substring(0,2)!='e&') {
-            if (rowcont[j]!='') { rowcont[j]+=':'; }
+            if ((rowcont[j]!='') && (rowcont[j]!=undefined)) { 
+               rowcont[j]+=':'; 
+            }
             rowcont[j]+=data1[k];
          }
       }
@@ -1573,7 +2437,15 @@ function condense() {
 // ---------------------------------------------------- Load from hidden fields
 
 function load() {
+   message("Loading");
+   schedule('load');
+}
+
+function finishload() {
+   var k;
+   for (k=0;k<objcont.length;k++) { objcont[k]=''; }
    objcont.length=0;
+   for (k=0;k<objlinks.length;k++) { objlinks[k]=''; }
    objlinks.length=0;
    objlinks[0]='';
    objcont[0]='';
@@ -1582,6 +2454,7 @@ function load() {
    lastinfo='';
    graphreset();
    var inputstr=parent.server.document.forms.storage.output.value;
+   if ((inputstr!='') && (inputstr!=undefined)) {
    data1=inputstr.split('<&>');
    var k;
    for (k=0;k<data1.length;k++) {
@@ -1592,10 +2465,37 @@ function load() {
        if (data2[0]=='obj') { obj[data2[1]]=data2[2]; }
        if (data2[0]=='objcont') { objcont[data2[1]]=data2[2]; }
        if (data2[0]=='objlinks') { objlinks[data2[1]]=data2[2]; }
+       if (data2[0]=='objparms') {
+          if (objparms[data2[1]]==undefined) {
+             objparms[data2[1]]=data2[2];
+          } else {
+             objparms[data2[1]]+=':'+data2[2];
+          }
+       }
        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]=''; }
+     }
+  }
+}
+
+// -------------------------------------------------------------- Parameter set
+
+function setparms(resid) {
+   var options="scrollbars=1,resizable=1,menubar=0";
+   parmflag=1;
+   data1=objcont[resid].split(':');
+   parm=open("/adm/ratparms?url="+data1[1]+"&parms="+objparms[resid]+
+             "&resid="+resid,"parmout",options);
+   parm.focus();
 }
 
 // -------------------------------------------------------------- Undo function
@@ -1605,7 +2505,7 @@ function undo() {
       undopointer--;
       parent.server.document.forms.storage.output.value
        =undostack[undopointer];
-      load();
+      finishload();
       undopointer--;
       draw();
       stored=0;
@@ -1621,7 +2521,7 @@ function redo() {
       undopointer++;
       parent.server.document.forms.storage.output.value
        =undostack[undopointer];
-      load();
+      finishload();
       undopointer--;
       draw();
       stored=0;
@@ -1639,18 +2539,108 @@ 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.flag==1) {
+     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);
+   checkdef();
+   wait();
+}
+
+// ----------------------------------------------------- launch indexer browser
+
+function groupsearch() {
+   alert('not yet implemented');
+}
+
+function groupimport() {
+   idxcheck('groupimport');
+}
+
 // -------------------------------------------------------------- Store changes
 
 function storechange() {
+   var k;
+   parent.flag=0;
    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
 
 function togglemode() {
-   if (tablemode==0) { tablemode=1; } else { tablemode=0; }
+   if (tablemode==0) { 
+      tablemode=1; 
+   } else {
+      if (tablemode==1) { 
+         tablemode=2; 
+      } else {
+         tablemode=0; 
+      } 
+   } 
+   notclear=0;
+   infoclear();
    draw();
 }
 
@@ -1659,21 +2649,26 @@ function togglemode() {
 function main() {
 
    if (mainrun==0) {
+      infopen();
+      infoclear();
       load();
-      draw();
       stored=1;
       mainrun=1;
    }
 
 }
 
-// ------------------------------------------------------------- Save on leave?
+// ---------------------------------------------------------- Close the window?
 
 function leave() {
-   if (stored==0) {
-      if (confirm('Store changes?')) {
-         storechange();   
-      }
+   if (!inf.closed) {
+      inf.close();
+   }
+   if (srch && !srch.closed) {
+      srchclose();
+   }
+   if (idx && !idx.closed) {
+      srchclose();
    }
 }
 
@@ -1682,16 +2677,15 @@ function leave() {
 
 <body bgcolor="#FFFFFF" onLoad="main();" onUnload="leave();">
 <a href="javascript:togglemode();">Toggle Display Mode</a>
+<a href="javascript:if (zscale>1) { zscale--; draw();}">Zoom Out</a>
+<a href="javascript:if (zscale<3) { zscale++; draw();}">Zoom In</a>
 <a href="javascript:condense();draw();">Condense</a>
 <a href="javascript:graphopt();draw();">Straighten</a>
 <a href="javascript:revert();">Revert</a>
 <a href="javascript:undo();">Undo</a>
 <a href="javascript:redo();">Redo</a>
+<a href="javascript:groupsearch();">Group Search</a>
+<a href="javascript:groupimport();">Group Import</a>
 <a href="javascript:storechange();">Store</a>
 </body>
 </html>
-
-
-
-
-