--- rat/client/Attic/code.html	2001/07/04 18:19:53	1.40
+++ rat/client/Attic/code.html	2002/05/15 18:48:53	1.55
@@ -3,6 +3,32 @@
 <!--
 The LearningOnline Network
 Resource Assembly Tool
+//
+// $Id: code.html,v 1.55 2002/05/15 18:48:53 www Exp $
+//
+// Copyright Michigan State University Board of Trustees
+//
+// This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+//
+// LON-CAPA is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// LON-CAPA is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with LON-CAPA; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// /home/httpd/html/adm/gpl.txt
+//
+// http://www.lon-capa.org/
+//
+YEAR 2000
 7/23,7/24,7/26,
 8/11,8/14,8/18,8/19,8/20,8/21,8/22,8/25,8/26,8/28,8/30,8/31,
 9/1,9/2,9/4,9/5,9/6,
@@ -10,12 +36,15 @@ Resource Assembly Tool
 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/9,6/10,6/12,6/15,7/4,7/26,7/28,7/31,8/5,8/19,8/24,
+YEAR 2001
 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,06/28,06/29,07/04 Gerd Kortemeyer
+07/24,8/6,8/7,10/16 Scott Harrison
+03/01/02 Matthew Hall
 -->
 
 
@@ -95,13 +124,13 @@ var parmflag=-1; // 1 means currently op
                  // -1 means never yet opened/defined
                  
 var iconpath='/adm/lonIcons/';
+var raticons='/adm/rat/';
 
 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;
@@ -120,7 +149,7 @@ function insertrow(j,ex1,ex2) {
    objects=objects1+':'+objects2;
    data1=objects.split(':');
    for (kj=0;kj<data1.length;kj++) {
-     if ((data1[kj]!='') && (data1[kj]!=undefined)) {
+     if ((data1[kj]!='') && (typeof(data1[kj])!="undefined")) {
        thisisobj=obj[data1[kj]];
        thisobjtype=thisisobj.split('&')[0];
        if (thisobjtype=='v') {
@@ -161,7 +190,7 @@ function insertrow(j,ex1,ex2) {
                    }
                 }
              }
-             if ((newobj!='') && (newobj!=undefined)) {
+             if ((newobj!='') && (typeof(newobj)!="undefined")) {
                 thisobjcol=newobj.split('&')[1];
                 if (colcover.indexOf(':'+thisobjcol+':',0)==-1) {
                    colcover+=thisobjcol+':';  
@@ -187,7 +216,7 @@ function insertrow(j,ex1,ex2) {
                    }
                 }
              }
-             if ((newobj!='') && (newobj!=undefined)) {
+             if ((newobj!='') && (typeof(newobj)!="undefined")) {
                 thisobjcol=newobj.split('&')[1];
                 if (colcover.indexOf(':'+thisobjcol+':',0)==-1) {
                    colcover+=thisobjcol+':';  
@@ -206,7 +235,6 @@ function insertrow(j,ex1,ex2) {
 }
 
 // --------------------------------------------- Creates a new condition object
-
 function newcondition(content,type) {
    var ko;
    stored=0;
@@ -217,7 +245,6 @@ function newcondition(content,type) {
 }
 
 // ---------------------------------------------- Creates a new resource object
-
 function newresource(rid,cid,text,url,ext,type) {
    stored=0;
    objcont[addobj(rid,'b&'+rid+'&'+cid+':0:0:0')]=
@@ -226,7 +253,6 @@ function newresource(rid,cid,text,url,ex
 
 
 // -------------------------------- Insert a condition into a port of an object
-
 function insertcond(obj1,portnr,cond) {
    var k;
    stored=0;
@@ -243,7 +269,6 @@ function insertcond(obj1,portnr,cond) {
  
 // --------------------------------------------- Insert a column into the table
 // Inserts a new table column after table column j
-
 function insertcol(j) {
    var kj;
    stored=0;
@@ -256,7 +281,6 @@ function insertcol(j) {
 }
      
 // --------------------------------------------------------------- Find the row
-
 function findrow(jid) {
    var j;
    for (j=0;j<=maxrow;j++) { if (row[j]==jid) { return j; } }
@@ -264,7 +288,6 @@ function findrow(jid) {
 }
 
 // --------------------------------------------------------------- Find the col
-
 function findcol(jid) {
    var j;
    for (j=0;j<=maxcol;j++) { if (col[j]==jid) { return j; } }
@@ -279,12 +302,11 @@ function findcol(jid) {
 //
 // returns middle (col number of middle of obj1)
 // sets colmap (map of cols with object numbers)
-
 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]!='') && (rowcont[jid]!=undefined)) {
+ if ((rowcont[jid]!='') && (typeof(rowcont[jid])!="undefined")) {
    data2=rowcont[jid].split(':');
    for (j=0;j<data2.length;j++) {
       data3=obj[data2[j]].split('&');
@@ -325,7 +347,6 @@ function maprow (jid,obj1,ign) {
 // kid: colID, find point close to this
 // dkid: destination colID
 // returns colID
-
 function comingthru (jid,kid,dkid) {
    var k;
    maprow(jid,-1,1);
@@ -371,10 +392,7 @@ function comingthru (jid,kid,dkid) {
 // linkobj: object that the link goes to/comes from
 // sets inrow or outrow
 // return column
-
-
 function insertport (obj1,d,inout,linkobj) {
-
    var k; var port; var revport;
    stored=0;
    data1=obj[obj1].split('&');
@@ -403,7 +421,6 @@ function insertport (obj1,d,inout,linkob
          if ((data3[k]==0) && (colmap[k]==obj1) && (port==-1)) { port=k; } 
       }
    }
-
    if (port==-1) {
       if (colmap[k]==0) {
          revport=findcol(k);
@@ -450,11 +467,10 @@ function insertport (obj1,d,inout,linkob
 
 // ---------------------------- Make a new object and add it to the row content
 // returns object number of generated object
- 
 function addobj(kjid,objs) {
    stored=0;
    expense++;
-   if ((rowcont[kjid]!='') && (rowcont[kjid]!=undefined)) { 
+   if ((rowcont[kjid]!='') && (typeof(rowcont[kjid])!="undefined")) { 
       rowcont[kjid]+=':'; 
    }
    rowcont[kjid]+=obj.length;
@@ -464,7 +480,6 @@ function addobj(kjid,objs) {
 
 // ---------------------------------------- Make horizontal connection for hrid
 // hoffs=-1: this line goes on top of hrid
-
 function horizontal(hrid,hoffs,hfcol,htcol,hdest,hends) {
    hcrid=-1;
    if (hoffs==-1) {
@@ -491,7 +506,6 @@ function horizontal(hrid,hoffs,hfcol,htc
          }
       }
    }
-
    if (hcrid==-1) {
       insertrow(row[hrid]+hoffs,hfcol,htcol);
       addobj(maxrow,'h&'+maxrow+'&'+hfcol+':'+htcol+'&'+hdest+'&'+hends);
@@ -501,7 +515,6 @@ function horizontal(hrid,hoffs,hfcol,htc
 }
 
 // --------------------------------------- Deletes all references to object obj
-
 function delobj(obj1) {
    var k;
    stored=0;
@@ -510,7 +523,7 @@ function delobj(obj1) {
       rowcont[k]='';
       for (k2=0;k2<data4.length;k2++) {
          if (data4[k2]!=obj1) {
-            if ((rowcont[k]!='') && (rowcont[k]!=undefined)) { 
+            if ((rowcont[k]!='') && (typeof(rowcont[k])!="undefined")) { 
                rowcont[k]+=':'; 
             } 
             rowcont[k]+=data4[k2]; 
@@ -521,7 +534,6 @@ function delobj(obj1) {
 }
 
 // --------------------------------------------------------- Garbage collection
-
 function cleanup () {
    message("Garbage Collection");
    var j,kj,i;
@@ -532,7 +544,7 @@ function cleanup () {
    for (kj=0;kj<=maxcol;kj++) { data1[kj]=0; }
    for (kj=0;kj<=maxrow;kj++) {
      rowtype[kj]=0;
-     if ((rowcont[kj]!='') && (rowcont[kj]!=undefined)) {
+     if ((rowcont[kj]!='') && (typeof(rowcont[kj])!="undefined")) {
        data2=rowcont[kj].split(':');
        for (j=0;j<data2.length;j++) {
          if (obj[data2[j]].substring(0,2)=='e&') {
@@ -575,11 +587,9 @@ function cleanup () {
       rowtype[maxrow]=2;
       coltype[maxcol]=2;
    }
-
 }
 
 // -------------------------------------------- Delete a condition from a block
-
 function delcond(obj1,colid) {
    var k;
    stored=0;
@@ -599,7 +609,6 @@ function delcond(obj1,colid) {
 }
     
 // ----------------------------------------- Creates a new condition in a block
-
 function crecond(obj1,colid,condtext,condtype) {
    var k;
    data3=obj[obj1].split('&');
@@ -621,11 +630,10 @@ function crecond(obj1,colid,condtext,con
 // deletes the link linknr
 // h&rowID&incolID:outcolID&inObj:outObj&inupdown:outupdown
 // v&colID&inObj:outObj&updown
-
 function dellink (linknr) {
   var k; var obj1; var obj2;
   stored=0;
-  if ((objlinks[linknr]!='') && (objlinks[linknr]!=undefined)) {
+  if ((objlinks[linknr]!='') && (typeof(objlinks[linknr])!="undefined")) {
    data3=objlinks[linknr].split(':');
    obj1=data3[0];
    obj2=data3[1];
@@ -648,7 +656,7 @@ function dellink (linknr) {
       }
    }
    for (k=0;k<obj.length;k++) {
-     if ((obj[k]!='') && (obj[k]!=undefined)) {
+     if ((obj[k]!='') && (typeof(obj[k])!="undefined")) {
        data3=obj[k].split('&');
        if (((data3[0]=='v') || (data3[0]=='h')) && 
            (data3[data3.length-2]==linknr)) {
@@ -662,7 +670,6 @@ function dellink (linknr) {
 
 // ----------------------------------------------------------- Join two objects
 // Links obj1 with obj2, creates new objlink, marks all elements with number
-
 function joinres (obj1,obj2,cond) {
    stored=0;
    var minexpense;
@@ -697,7 +704,6 @@ function joinres (obj1,obj2,cond) {
       minexpense=expense;
    }
 
-
    if (best==0) {
       finishload();
       tryjoin(obj1,obj2,cond,1,1);
@@ -710,10 +716,8 @@ function joinres (obj1,obj2,cond) {
       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;
 
@@ -812,7 +816,6 @@ function tryjoin(obj1,obj2,cond,d1,d2) {
 // ---------------------------------------------------------- Delete a resource
 // Deletes resource obj1
 // Reconnects resources going thru this one if recon=1
-
 function delres (obj1,recon) {
    var infromobj=new Array();
    var inwithcon=new Array();
@@ -860,7 +863,7 @@ function delres (obj1,recon) {
                if (inobjs[k2]==infromobj[k]) {
                   if (inwithcon[k]!=0) {
                      if ((inobjscond[k2]!='') &&
-                         (inobjscond[k2]!=undefined)) { 
+                         (typeof(inobjscond[k2])!="undefined")) { 
                          inobjscond[k2]+='||'; 
                      }
                      inobjscond[k2]+=
@@ -889,7 +892,7 @@ function delres (obj1,recon) {
                if (outobjs[k2]==outtoobj[k]) {
                  if (outwithcon[k]!=0) {
                      if ((outobjscond[k2]!='') &&
-                         (outobjscond[k2]!=undefined)) { 
+                         (typeof(outobjscond[k2])!="undefined")) { 
                          outobjscond[k2]+='||'; 
                      }
                      outobjscond[k2]+=
@@ -913,19 +916,19 @@ function delres (obj1,recon) {
 
       for (k=0;k<inobjs.length;k++) {
           cond='';
-          if ((inobjscond[k]!='') && (inobjscond[k]!=undefined)) { 
+          if ((inobjscond[k]!='') && (typeof(inobjscond[k])!="undefined")) { 
              cond='('+inobjscond[k]+')'; 
           }
           for (k2=0;k2<outobjs.length;k2++) {
               thiscond=cond;
-              if ((outobjscond[k2]!='') && (outobjscond[k2]!=undefined)) {
-                 if ((thiscond!='') && (thiscond!=undefined)) { 
+              if ((outobjscond[k2]!='') && (typeof(outobjscond[k2])!="undefined")) {
+                 if ((thiscond!='') && (typeof(thiscond)!="undefined")) { 
                     thiscond+='&&'; 
                  }
                  thiscond+='('+outobjscond[k2]+')';
               }
               condnr=0;
-              if ((thiscond!='') && (thiscond!=undefined)) { 
+              if ((thiscond!='') && (typeof(thiscond)!="undefined")) { 
                  condnr=newcondition(thiscond,'normal'); 
               }
               save(); 
@@ -936,7 +939,6 @@ function delres (obj1,recon) {
 }
 
 // -------------------------------------------------------------- Draw an entry
-
 function drawcell (rtype,ctype,what,cm,obj1,ej,ek,ne) {
  var bgcolor;
  var url='';
@@ -949,8 +951,8 @@ function drawcell (rtype,ctype,what,cm,o
  if ((what=='') && (ne==0)) { cm="#DDDDDD"; }
  if (ctype!=0) {
    parent.mapout.document.write('<td bgcolor='+cm+' width='+cw[ctype]+'>');
-   if ((what!='') && (what!=undefined)) {
-     if ((obj1!='') && (obj1!=undefined)) {
+   if ((what!='') && (typeof(what)!="undefined")) {
+     if ((obj1!='') && (typeof(obj1)!="undefined")) {
        objref="'"+obj1+"'";
        parent.mapout.document.write
         ('<a href="javascript:parent.code.handler('+objref
@@ -959,101 +961,101 @@ function drawcell (rtype,ctype,what,cm,o
      if (what=='r:') {
         mime='';
         objnum=(obj1.split('&'))[1];
-        if (objcont[objnum]!=undefined) {
+        if (typeof(objcont[objnum])!="undefined") {
             urlparts=objcont[objnum].split(':');
             url=urlparts[1];
             ext=urlparts[2];
             urlparts=url.split('.');
             mime=urlparts[urlparts.length-1];
-            if (mime==undefined) { mime=''; }
+            if (typeof(mime)=="undefined") { mime=''; }
         }
         parent.mapout.document.write
          ('<img border=0 width='+cw[ctype]+' height='+rh[1]
-          +' src="resource.gif">');
+          +' src="'+raticons+'resource.gif">');
         if ((mime!='') && (ext!='true')) {
            parent.mapout.document.write
-           ('<br><img border=0 src="left.gif"></a><a target="preview" href="'+
+           ('<br><img border=0 src="'+raticons+'left.gif"></a><a target="preview" href="'+
            url+'.meta"><img border=0 src="'+iconpath+
            'meta.gif"><a target="preview" href="'+url+
            '"><img border=0 src="'+iconpath+mime+'.gif">'+
-           '<img border=0 src="right.gif">');
+           '<img border=0 src="'+raticons+'right.gif">');
         } else {
            parent.mapout.document.write
-           ('<br><img border=0 src="middle.gif">');
+           ('<br><img border=0 src="'+raticons+'middle.gif">');
         }
         parent.mapout.document.write
-           ('<br><img border=0 src="bottom.gif">');
+           ('<br><img border=0 src="'+raticons+'bottom.gif">');
      } else {
         if (what=='c:') {
            parent.mapout.document.write
             ('<img border=0 width='+cw[ctype]+' height='+rh[rtype]
-             +' src="condition.gif">');          
+             +' src="'+raticons+'condition.gif">');          
         } else {
            if (what=='rs:') {
         mime='';
         objnum=(obj1.split('&'))[1];
-        if (objcont[objnum]!=undefined) {
+        if (typeof(objcont[objnum])!="undefined") {
             urlparts=objcont[objnum].split(':');
             url=urlparts[1];
             ext=urlparts[2];
             urlparts=url.split('.');
             mime=urlparts[urlparts.length-1];
-            if (mime==undefined) { mime=''; }
+            if (typeof(mime)=="undefined") { mime=''; }
         }
               parent.mapout.document.write
                ('<img border=0 width='+cw[ctype]+' height='+rh[1]
-               +' src="start.gif">');
+               +' src="'+raticons+'start.gif">');
         if ((mime!='') && (ext!='true')) {
            parent.mapout.document.write
-           ('<br><img border=0 src="left.gif"></a><a target="preview" href="'+
+           ('<br><img border=0 src="'+raticons+'left.gif"></a><a target="preview" href="'+
            url+'.meta"><img border=0 src="'+iconpath+
            'meta.gif"><a target="preview" href="'+url+
            '"><img border=0 src="'+iconpath+mime+'.gif">'+
-           '<img border=0 src="right.gif">');
+           '<img border=0 src="'+raticons+'right.gif">');
         } else {
            parent.mapout.document.write
-           ('<br><img border=0 src="middle.gif">');
+           ('<br><img border=0 src="'+raticons+'middle.gif">');
         }
         parent.mapout.document.write
-           ('<br><img border=0 src="bottom.gif">');
+           ('<br><img border=0 src="'+raticons+'bottom.gif">');
 
            } else {
              if (what=='rf:') {
         mime='';
         objnum=(obj1.split('&'))[1];
-        if (objcont[objnum]!=undefined) {
+        if (typeof(objcont[objnum])!="undefined") {
             urlparts=objcont[objnum].split(':');
             url=urlparts[1];
             ext=urlparts[2];
             urlparts=url.split('.');
             mime=urlparts[urlparts.length-1];
-            if (mime==undefined) { mime=''; }
+            if (typeof(mime)=="undefined") { mime=''; }
         }
                 parent.mapout.document.write
                 ('<img border=0 width='+cw[ctype]+' height='+rh[1]
-                +' src="finish.gif">');
+                +' src="'+raticons+'finish.gif">');
         if ((mime!='') && (ext!='true')) {
            parent.mapout.document.write
-           ('<br><img border=0 src="left.gif"></a><a target="preview" href="'+
+           ('<br><img border=0 src="'+raticons+'left.gif"></a><a target="preview" href="'+
            url+'.meta"><img border=0 src="'+iconpath+
            'meta.gif"><a target="preview" href="'+url+
            '"><img border=0 src="'+iconpath+mime+'.gif">'+
-           '<img border=0 src="right.gif">');
+           '<img border=0 src="'+raticons+'right.gif">');
         } else {
            parent.mapout.document.write
-           ('<br><img border=0 src="middle.gif">');
+           ('<br><img border=0 src="'+raticons+'middle.gif">');
         }
         parent.mapout.document.write
-           ('<br><img border=0 src="bottom.gif">');
+           ('<br><img border=0 src="'+raticons+'bottom.gif">');
              } else {
                 parent.mapout.document.write
                 ('<img border=0 width='+cw[ctype]+' height='+rh[rtype]
-                +' src="'+rtype+'.'+ctype+'.'+what+'.gif">');
+                +' src="'+raticons+rtype+'.'+ctype+'.'+what+'.gif">');
              }
            }
         }
      }
-     if ((obj1!='') && (obj1!=undefined)) {
+     if ((obj1!='') && (typeof(obj1)!="undefined")) {
        parent.mapout.document.write('</a>');
      }
    } else {
@@ -1069,14 +1071,13 @@ function drawcell (rtype,ctype,what,cm,o
       parent.mapout.document.write
          (
          '<img border=0 width='+cw[ctype]+' height='+rh[rtype]
-        +' src="'+rtype+'.'+ctype+'.empty.gif"></a>');
+        +' src="'+raticons+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'; }
@@ -1087,7 +1088,6 @@ function rescolor (ext,typ) {
 }
 
 // -------------------------------------------------------- Color of conditions
-
 function condcolor(typ) {
    if (typ=='stop')  { return '#EEAAAA'; }
    if (typ=='force') { return '#AAAAEE'; }
@@ -1095,7 +1095,6 @@ function condcolor(typ) {
 }
 
 // ----------------------------------------------------------------- Draw a row
-
 function drawrow (jid) {
 var j; var jk; var k;  var ck; var rtype;
 var objd1=new Array();
@@ -1110,7 +1109,7 @@ if (rowtype[jid]!=0) {
  }
 
  parent.mapout.document.writeln('<tr height='+rh[rowtype[jid]]+'>');
- if ((rowcont[jid]!='') && (rowcont[jid]!=undefined)) {
+ if ((rowcont[jid]!='') && (typeof(rowcont[jid])!="undefined")) {
    data2=rowcont[jid].split(':');
    for (jk=0;jk<data2.length;jk++) {
       data3=obj[data2[jk]].split('&');
@@ -1167,7 +1166,7 @@ if (rowtype[jid]!=0) {
 
          if (rightin>middle) {
             for (k=middle+1;k<rightin;k++) { 
-               if ((colmap4[k]!='') && (colmap4[k]!=undefined)) {
+               if ((colmap4[k]!='') && (typeof(colmap4[k])!="undefined")) {
                   colmap[k]='rlt'; 
                } else {
                   colmap[k]='rl';
@@ -1177,7 +1176,7 @@ if (rowtype[jid]!=0) {
          }
          if (leftin<middle) {
             for (k=middle-1;k>leftin;k--) { 
-               if ((colmap4[k]!='') && (colmap4[k]!=undefined)) {
+               if ((colmap4[k]!='') && (typeof(colmap4[k])!="undefined")) {
                   colmap[k]='lrt'; 
                } else {
                   colmap[k]='lr';
@@ -1197,7 +1196,7 @@ if (rowtype[jid]!=0) {
             if (rightout<middle)  { colmap2[middle]='tl'; }
             if (rightout==middle) { colmap2[middle]='tdl'; }
             if (rightout>middle)  { 
-              if ((colmap3[middle]!='') && (colmap3[middle]!=undefined)) {
+              if ((colmap3[middle]!='') && (typeof(colmap3[middle])!="undefined")) {
                  colmap2[middle]='rtdl'; 
               } else {
                  colmap2[middle]='rtl';
@@ -1206,7 +1205,7 @@ if (rowtype[jid]!=0) {
          }
          if (leftout<middle) {
             for (k=middle-1;k>leftout;k--) { 
-               if ((colmap3[k]!='') && (colmap3[k]!=undefined)) {
+               if ((colmap3[k]!='') && (typeof(colmap3[k])!="undefined")) {
                   colmap2[k]='rld'; 
                } else {
                   colmap2[k]='rl';
@@ -1216,7 +1215,7 @@ if (rowtype[jid]!=0) {
          }
          if (rightout>middle) {
             for (k=middle+1;k<rightout;k++) { 
-               if ((colmap3[k]!='') && (colmap3[k]!=undefined)) {
+               if ((colmap3[k]!='') && (typeof(colmap3[k])!="undefined")) {
                   colmap2[k]='lrd'; 
                } else {
                   colmap2[k]='lr';
@@ -1299,13 +1298,11 @@ if (rowtype[jid]!=0) {
 }
 
 // -------------------------------------------------------------- Print message
-
 function message(txt) {
    parent.window.status=txt;
 }
 
 // ------------------------------------------------------------- Draw the table
-         
 function draw () {
    var k; var kr;
 
@@ -1354,7 +1351,6 @@ function draw () {
 }
 
 // --------------------------------------------------------- Clears info window
-
 function infoclear() {
  if (notclear!=1) {
   infcheck();
@@ -1402,14 +1398,12 @@ 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();
@@ -1417,7 +1411,6 @@ function infcheck() {
 }
 
 // --------------------------------------------------- Prints out resource info
-
 function info(infostr) {
  var mime='';
  var ext;
@@ -1429,7 +1422,7 @@ function info(infostr) {
   inf.document.clear();
   inf.document.writeln(
    '<html><body bgcolor="#FFFFFF">'+
-   '<table><tr><td width=32><img src="info.gif"></td><td bgcolor="#AAFFAA">');
+   '<table><tr><td width=32><img src="'+raticons+'info.gif"></td><td bgcolor="#AAFFAA">');
   data1=infostr.split('&');
   if (data1[0]=='c') {
      inf.document.write('<b>Condition (');
@@ -1457,7 +1450,7 @@ function info(infostr) {
         ext=data2[2];
         urlparts=url.split('.');
         mime=urlparts[urlparts.length-1];
-        if (mime==undefined) { mime=''; }
+        if (typeof(mime)=="undefined") { mime=''; }
         if (ext=='true') { mime=''; }
         if (mime!='') {
            inf.document.write
@@ -1510,7 +1503,6 @@ function info(infostr) {
 }
 
 // ------------------------------------------------ "Escapes" out special chars
-
 function escape(instring) {
    var outstring='';
    var thischar;
@@ -1518,7 +1510,7 @@ function escape(instring) {
    for (k=0;k<instring.length;k++) {
       thischar=instring.charAt(k);
       if (thischar==':') { thischar='&#58;'; }
-      if (thischar=='"') { thischar='&#34;'; }
+      if (thischar=='"') { thischar='&#34;'; }// "
       if (thischar=="'") { thischar='&#39;'; }
       if (thischar==',') { thischar='&#44;'; }
       outstring+=thischar;
@@ -1527,7 +1519,6 @@ function escape(instring) {
 }
 
 // -------------------------------------------------- Insert resource into link
-
 function insertreslink(infostr) {
    var lnr;
    var fobj;
@@ -1560,7 +1551,6 @@ function insertreslink(infostr) {
 }
 
 // -------------------------------------------- Insert resource after condition
-
 function insertcondlink(cid,lnr) {
    var fobj;
    var tobj;
@@ -1581,29 +1571,22 @@ function insertcondlink(cid,lnr) {
    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;
@@ -1612,7 +1595,6 @@ function idxclose() {
 }
 
 // ------------------------------------------------------- Closes search window
-
 function srchclose() {
   if (srch && !srch.closed) {
     srchflag=0;
@@ -1621,7 +1603,6 @@ function srchclose() {
 }
 
 // ------------------------------------------------------- Closes search window
-
 function parmclose() {
   if (parm && !parm.closed) {
     parmflag=0;
@@ -1630,42 +1611,37 @@ function parmclose() {
 }
 
 // -------------------------------------------------------- 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=open("/res/?launch=1&mode=rat&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=open("/adm/searchcat?launch=1&mode=rat&catalogmode="+mode,"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();
+      srchopen(mode);
    }
    srch.focus();
 }
 
 // -------------------------------------------------------- Do idx status check
-
 function idxcheck(mode) {
    if (!idx || idx.closed || idxmode!=mode) {
       idxopen(mode);
@@ -1674,7 +1650,6 @@ function idxcheck(mode) {
 }
 
 // ---------------------------------------------------- Handles "click to edit"
-
 function handler(infostr) {
   var k;
   editmode=1;
@@ -1683,7 +1658,7 @@ function handler(infostr) {
   inf.document.clear();
   inf.document.writeln(
    '<html><body bgcolor="#FFFFFF">'+
-   '<table><tr><td width=32><img src="edit.gif"></td><td bgcolor="#AAFFAA">');
+   '<table><tr><td width=32><img src="'+raticons+'edit.gif"></td><td bgcolor="#AAFFAA">');
   data1=infostr.split('&');
   if (data1[0]=='c') {
      inf.document.writeln('<b>Condition</b><hr>');
@@ -1737,8 +1712,6 @@ function handler(infostr) {
          '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) {
@@ -1845,7 +1818,6 @@ function handler(infostr) {
 }
 
 // ----------------------------------------------------- Clicks on empty fields
-
 function empty(rid,k) {
   var cid=findcol(k);
   var lcol=k-1;
@@ -1858,7 +1830,7 @@ function empty(rid,k) {
   inf.document.clear();
   inf.document.writeln(
    '<html><body bgcolor="#FFFFFF">'+
-   '<table><tr><td width=32><img src="edit.gif"></td><td bgcolor="#AAFFAA">'+
+   '<table><tr><td width=32><img src="'+raticons+'edit.gif"></td><td bgcolor="#AAFFAA">'+
    '<b>Empty Field</b><hr>');
 
         inf.document.writeln('<br><a href="javascript:opener.newresource('+
@@ -1868,7 +1840,7 @@ function empty(rid,k) {
           +');">Insert resource</a>');
 
   if ((mostrecent!=0) && (objcont[mostrecent]!='') && 
-                         (objcont[mostrecent]!=undefined)) {
+                         (typeof(objcont[mostrecent])!="undefined")) {
 
         inf.document.writeln('<br><a href="javascript:opener.newresource('+
           rid+','+cid+",'','','false','normal');"+
@@ -1915,7 +1887,6 @@ function empty(rid,k) {
 }
 
 // ---------------------------------------------------- Save into hidden fields
-
 function save() {
   var k;
   if (graphdef=='yes') {
@@ -1974,7 +1945,6 @@ function save() {
 }
 
 // ----------------------------------------------- Reset all layout information
-
 function graphreset() {
 
    var k;
@@ -1997,7 +1967,7 @@ function graphreset() {
 
    objcont[0]='';
    objlinks[0]='';
-   if (((objcont[1]==undefined)&&(objcont[2]==undefined)) ||
+   if (((typeof(objcont[1])=="undefined")&&(typeof(objcont[2])=="undefined")) ||
        ((objcont[1]=='')&&(objcont[2]==''))) { 
       objcont[1]='Start::false:start:res'
       objcont[2]='Finish::false:finish:res';
@@ -2007,7 +1977,6 @@ function graphreset() {
 }
 
 // --------------------- Compare two resources with each other for "straighten"
-
 function rescompare(a,b) {
    data1=a.split(':');
    data2=b.split(':');
@@ -2016,7 +1985,7 @@ function rescompare(a,b) {
    for (k=1;k<data1.length;k++) {
       if (data1[k]==data2[0]) { rvalue--; }
    }
-   for (k=1;k<data3.length;k++) {
+   for (k=1;k<data2.length;k++) {
       if (data2[k]==data1[0]) { rvalue++; }
    }
    if (rvalue==0) { rvalue=data2.length-data1.length; }
@@ -2024,7 +1993,6 @@ function rescompare(a,b) {
 }
 
 // -------------------------------------------- Draw the table instead of graph
-
 function tabledraw() {
   var objsorted=new Array();
   var robjs=new Array();
@@ -2038,10 +2006,11 @@ function tabledraw() {
   var condid;
   var url='';
   var mime='';
+  var ext='';
   var urlparts=new Array;
   var sortstr=sortobjs();
  insrestab(1,-1,-1,'');
- if ((sortstr!='') && (sortstr!=undefined)) {
+ if ((sortstr!='') && (typeof(sortstr)!="undefined")) {
   objsorted=sortstr.split('&');
   for (k=0;k<objsorted.length;k++) {
      i=(objsorted[k].split(':'))[0];
@@ -2059,10 +2028,11 @@ function tabledraw() {
        ck=rescolor(data1[2],data1[3]);
         parent.mapout.document.write('<tr><td bgcolor="'+ck+'">');
         url=data1[1];
+        ext=data1[2];
         urlparts=url.split('.');
         mime=urlparts[urlparts.length-1];
-        if (mime==undefined) { mime=''; }
-        if (mime!='') {
+        if (typeof(mime)=="undefined") { mime=''; }
+        if ((mime!='') && (ext!='true')) {
            parent.mapout.document.write
            ('<a target="preview" align="right" href="'+url+'.meta'+
            '"><img src="'+iconpath+'meta.gif"></a><p>'+
@@ -2199,7 +2169,6 @@ function tabledraw() {
 }
 
 // ----------------------------------------------------- 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('
@@ -2241,8 +2210,8 @@ function insrestab(irow,be,af,typ) {
   }
   parent.mapout.document.writeln('</td></tr></table></tr>');
 }
-// ---------------------------------------- Draw simple table instead of graph
 
+// ---------------------------------------- Draw simple table instead of graph
 function simpletabledraw() {
   var objsorted=new Array();
   var robjs=new Array();
@@ -2253,9 +2222,13 @@ function simpletabledraw() {
   var nr;
   var ck;
   var cck;
+  var mime;
+  var ext;
+  var url;
+  var urlparts=new Array;
   var condid;
   var sortstr=sortobjs();
- if ((sortstr!='') && (sortstr!=undefined)) {
+ if ((sortstr!='') && (typeof(sortstr)!="undefined")) {
   objsorted=sortstr.split('&');
   for (k=0;k<objsorted.length;k++) {
      i=(objsorted[k].split(':'))[0];
@@ -2273,10 +2246,11 @@ function simpletabledraw() {
        ck=rescolor(data1[2],data1[3]);
         parent.mapout.document.write('<tr><td bgcolor="'+ck+'">');
         url=data1[1];
+        ext=data1[2];
         urlparts=url.split('.');
         mime=urlparts[urlparts.length-1];
-        if (mime==undefined) { mime=''; }
-        if (mime!='') {
+        if (typeof(mime)=="undefined") { mime=''; }
+        if ((mime!='') && (ext!='true')) {
            parent.mapout.document.write
            ('<a target="preview" align="right" href="'+url+'.meta'+
            '"><img src="'+iconpath+'meta.gif"></a><p>'+
@@ -2342,7 +2316,6 @@ function simpletabledraw() {
 }
 
 // ---------------------------------- Sort objects to straighten graph or table
-
 function sortobjs() {
    message("Sorting Resources: "+funny);
    var k;
@@ -2364,7 +2337,7 @@ function sortobjs() {
    for (k=1;k<objlinks.length;k++) {
      wheelswitch();
      message("Sorting Resources: "+funny);
-     if ((objlinks[k]!=undefined) && (objlinks[k]!='')) {
+     if ((typeof(objlinks[k])!="undefined") && (objlinks[k]!='')) {
       sortthis=1;
       data1=objlinks[k].split(':');
       kj=-1;
@@ -2415,12 +2388,10 @@ function sortobjs() {
 }
 
 // ----------------------------------------------------------- Straighten graph
-
 function graphopt() {
   var k;
   var kj;
   var ij;
-
   var objsorted=new Array();
   condense(); 
   graphreset();
@@ -2480,17 +2451,16 @@ function graphopt() {
 }
 
 // ----------------------------------------------------------- Remove e-objects
-
 function condense() {
    message("Condensing");
    var j;
    for (j=0;j<=maxrow;j++) {
-     if ((rowcont[j]!='') && (rowcont[j]!=undefined)) {
+     if ((rowcont[j]!='') && (typeof(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]!=undefined)) { 
+            if ((rowcont[j]!='') && (typeof(rowcont[j])!="undefined")) { 
                rowcont[j]+=':'; 
             }
             rowcont[j]+=data1[k];
@@ -2501,7 +2471,6 @@ function condense() {
 }
 
 // ---------------------------------------------------- Load from hidden fields
-
 function load() {
    message("Loading");
    schedule('load');
@@ -2520,11 +2489,11 @@ function finishload() {
    lastinfo='';
    graphreset();
    var inputstr=parent.server.document.forms.storage.output.value;
-   if ((inputstr!='') && (inputstr!=undefined)) {
+   if ((inputstr!='') && (typeof(inputstr)!="undefined")) {
    data1=inputstr.split('<&>');
    var k;
    for (k=0;k<data1.length;k++) {
-       data2=data1[k].split('<:>');
+       data2=data1[k].split('&colon;').join('&#58;').split('<:>');
        if (data2[0]=='graphdef') { graphdef=data2[1]; }
        if (data2[0]=='maxcol') { maxcol=1*data2[1]; }
        if (data2[0]=='maxrow') { maxrow=1*data2[1]; }
@@ -2532,7 +2501,7 @@ function finishload() {
        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) {
+          if (typeof(objparms[data2[1]])=="undefined") {
              objparms[data2[1]]=data2[2];
           } else {
              objparms[data2[1]]+=':'+data2[2];
@@ -2548,13 +2517,12 @@ function finishload() {
   }
   if (graphdef=='yes') {
      for (k=1;k<=maxrow;k++) {
-        if (rowcont[k]==undefined) { rowcont[k]=''; }
+        if (typeof(rowcont[k])=="undefined") { rowcont[k]=''; }
      }
   }
 }
 
 // -------------------------------------------------------------- Parameter set
-
 function setparms(resid) {
    var options="scrollbars=1,resizable=1,menubar=0";
    parmflag=1;
@@ -2565,7 +2533,6 @@ function setparms(resid) {
 }
 
 // -------------------------------------------------------------- Undo function
-
 function undo() {
    if (undopointer>1) {
       undopointer--;
@@ -2581,7 +2548,6 @@ function undo() {
 }
 
 // -------------------------------------------------------------- Redo function
-
 function redo() {
    if (undopointer<undostack.length-1) {
       undopointer++;
@@ -2597,7 +2563,6 @@ function redo() {
 }
  
 // ------------------------------------------------------------ Revert function
-
 function revert() {
    if (confirm("Revert to beginning of edit session?")) {
       undopointer=2;
@@ -2606,7 +2571,6 @@ function revert() {
 }
 
 // ---------------------------------------------------------------- Wheelswitch
-
 function wheelswitch() {
    if (funny=='|') { 
       funny='/'; 
@@ -2624,7 +2588,6 @@ function wheelswitch() {
 }
 
 // --------------------------------------------- Checks if server frame defined
-
 function checkdef() {
    if (parent.flag==1) {
      srvloaded();
@@ -2633,7 +2596,6 @@ function checkdef() {
 }
 
 // ---------------------------------------------------------- The wait function
-
 function wait() {
    if ((finishdone==1) || (tim==1)) {
       if (tim==0) {
@@ -2651,7 +2613,6 @@ function wait() {
 }
 
 // ---------------------------------------------------------- Schedule function
-
 function schedule(action) {
    reqaction=action;
    tim=0;
@@ -2662,9 +2623,8 @@ function schedule(action) {
 }
 
 // ----------------------------------------------------- launch indexer browser
-
 function groupsearch() {
-   alert('not yet implemented');
+   srchcheck('groupsearch');
 }
 
 function groupimport() {
@@ -2672,7 +2632,6 @@ function groupimport() {
 }
 
 // -------------------------------------------------------------- Store changes
-
 function storechange() {
    var k;
    parent.flag=0;
@@ -2687,14 +2646,12 @@ function finishsave() {
 }
 
 // --------------------------------------- Gets called when submission finished
-
 function srvloaded() {
    finishdone=1;
    message("Server replied.");
 }
 
 // ---------------------------------------------------------------- Toggle Mode
-
 function togglemode() {
    if (tablemode==0) { 
       tablemode=1; 
@@ -2711,9 +2668,7 @@ function togglemode() {
 }
 
 // -------------------------------------------------------- Main program onLoad
-
 function main() {
-
    if (mainrun==0) {
       infopen();
       infoclear();
@@ -2721,11 +2676,9 @@ function main() {
       stored=1;
       mainrun=1;
    }
-
 }
 
 // ---------------------------------------------------------- Close the window?
-
 function leave() {
    if (!inf.closed) {
       inf.close();
@@ -2741,17 +2694,25 @@ function leave() {
 </script>
 </head>
 
-<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();">Save Map</a>
+<body bgcolor="#FFFFFF" onUnload="leave();">
+<table border=0><tr><td bgcolor="#aaaaaa">
+<table border=0><tr>
+<td bgcolor="#ffffcc"><a href="javascript:togglemode();"><b>T</b>oggle display</a>&nbsp;</td>
+<td bgcolor="#ffffcc"><a href="javascript:if (zscale>1) { zscale--; draw();}"><b>Z</b>oom out</a>&nbsp;</td>
+<td bgcolor="#ffffcc"><a href="javascript:if (zscale<3) { zscale++; draw();}"><b>Z</b>oom in</a>&nbsp;</td>
+<td bgcolor="#ffffcc"><a href="javascript:condense();draw();"><b>C</b>ondense</a>&nbsp;</td>
+<td bgcolor="#ffffcc"><a href="javascript:graphopt();draw();"><b>S</b>traighten</a>&nbsp;</td>
+<td bgcolor="#ffffcc"><a href="javascript:revert();"><b>R</b>evert</a>&nbsp;</td>
+<td bgcolor="#ffffcc"><a href="javascript:undo();"><b>U</b>ndo</a>&nbsp;</td>
+<td bgcolor="#ffffcc"><a href="javascript:redo();"><b>R</b>edo</a>&nbsp;</td>
+<td bgcolor="#ffffcc"><a href="javascript:groupsearch();"><b>G</b>roup search</a>&nbsp;</td>
+<td bgcolor="#ffffcc"><a href="javascript:groupimport();"><b>G</b>roup import</a>&nbsp;</td>
+<td bgcolor="#ffffcc"><a href="javascript:graphdef='no';save();storechange();"><b>S</b>ave map</a>&nbsp;</td>
+<td bgcolor="#ccffcc"><a href="javascript:storechange();"><b>S</b>ave map and layout</a>&nbsp;</td>
+</tr></table>
+</td></tr></table>
+<script>
+main();
+</script>
 </body>
 </html>