--- rat/client/ratcode.js	2006/06/19 09:43:02	1.6
+++ rat/client/ratcode.js	2009/03/23 22:25:19	1.8
@@ -1,7 +1,7 @@
 <!--
 The LearningOnline Network
 Resource Assembly Tool
-// $Id: ratcode.js,v 1.6 2006/06/19 09:43:02 www Exp $
+// $Id: ratcode.js,v 1.8 2009/03/23 22:25:19 droeschl Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -244,9 +244,10 @@ function newcondition(content,type) {
 }
 
 // ---------------------------------------------- Creates a new resource object
-function newresource(rid,cid,text,url,ext,type) {
+function newresource(rid,cid,text,url,ext,type,oldidx) {
    stored=0;
-   var newidx=addobj(rid,'b&'+rid+'&'+cid+':0:0:0',url);
+   var newidx=addobj(rid,'b&'+rid+'&'+cid+':0:0:0',url,oldidx);
+
    objcont[newidx]=
     text+':'+url+':'+ext+':'+type+':res';
    return newidx;
@@ -468,7 +469,7 @@ 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,url) {
+function addobj(kjid,objs,url,oldindex) {
    stored=0;
    expense++;
    if ((rowcont[kjid]!='') && (typeof(rowcont[kjid])!="undefined")) { 
@@ -476,13 +477,19 @@ function addobj(kjid,objs,url) {
    }
    var newindex=obj.length;
    if ((url!='') && (typeof(url)!="undefined")) {
-// see if we have a zombie with that url
+// see if we have a zombie with that url and possibly oldindex
       for (oidx=0;oidx<objcont.length;oidx++) {
           if (typeof(objcont[oidx])!="undefined") {
              data6=objcont[oidx].split(':');	
              if (data6[4]=='zombie') {
                 if (data6[1]==url) {
-                   newindex=oidx;
+		   if (typeof(oldindex) == "undefined") {
+                     newindex=oidx;
+                   } else {
+                     if (oidx == oldindex) {
+                       newindex=oidx;
+                     }
+                   }
                 }
              }
          }
@@ -997,9 +1004,9 @@ function drawcell (rtype,ctype,what,cm,o
         if ((mime!='') && (ext!='true')) {
            parent.mapout.document.write
            ('<br><img border=0 src="'+raticons+'left.gif"></a><a target="preview" href="'+
-           url+'.meta"><img border=0 src="'+iconpath+
+           url+'.meta"><img border=0 width=20 src="'+iconpath+
            'meta.gif"><a target="preview" href="'+url+
-           '"><img border=0 src="'+iconpath+mime+'.gif">'+
+           '"><img border=0 width=20 src="'+iconpath+mime+'.gif">'+
            '<img border=0 src="'+raticons+'right.gif">');
         } else {
            parent.mapout.document.write
@@ -1037,9 +1044,9 @@ function drawcell (rtype,ctype,what,cm,o
         if ((mime!='') && (ext!='true')) {
            parent.mapout.document.write
            ('<br><img border=0 src="'+raticons+'left.gif"></a><a target="preview" href="'+
-           url+'.meta"><img border=0 src="'+iconpath+
+           url+'.meta"><img border=0 width=20 src="'+iconpath+
            'meta.gif"><a target="preview" href="'+url+
-           '"><img border=0 src="'+iconpath+mime+'.gif">'+
+           '"><img border=0 width=20 src="'+iconpath+mime+'.gif">'+
            '<img border=0 src="'+raticons+'right.gif">');
         } else {
            parent.mapout.document.write
@@ -1073,9 +1080,9 @@ function drawcell (rtype,ctype,what,cm,o
         if ((mime!='') && (ext!='true')) {
            parent.mapout.document.write
            ('<br><img border=0 src="'+raticons+'left.gif"></a><a target="preview" href="'+
-           url+'.meta"><img border=0 src="'+iconpath+
+           url+'.meta"><img border=0 width=20 src="'+iconpath+
            'meta.gif"><a target="preview" href="'+url+
-           '"><img border=0 src="'+iconpath+mime+'.gif">'+
+           '"><img border=0 width=20 src="'+iconpath+mime+'.gif">'+
            '<img border=0 src="'+raticons+'right.gif">');
         } else {
            parent.mapout.document.write
@@ -1497,7 +1504,7 @@ function info(infostr) {
         if (mime!='') {
            inf.document.write
            ('<br><a target="preview" align="right" href="'+url+
-           '"><img border=0 src="'+iconpath+mime+'.gif"></a>&nbsp;&nbsp;');
+           '"><img border=0 width=20 src="'+iconpath+mime+'.gif"></a>&nbsp;&nbsp;');
         }
        inf.document.write('<b>');
         if (data2[2]=='true') { inf.document.write('External '); }
@@ -2151,9 +2158,9 @@ function tabledraw() {
         if ((mime!='') && (ext!='true')) {
            parent.mapout.document.write
            ('<a target="preview" align="right" href="'+url+'.meta'+
-           '"><img src="'+iconpath+'meta.gif"></a><p>'+
+           '"><img width=20 src="'+iconpath+'meta.gif"></a><p>'+
            '<a target="preview" align="right"href="'+url+
-           '"><img src="'+iconpath+mime+'.gif"></a><p>');
+           '"><img width=20 src="'+iconpath+mime+'.gif"></a><p>');
         }
          parent.mapout.document.write(
          '<b><a href="javascript:if (parent.code.linkmode!=0) { '
@@ -2369,9 +2376,9 @@ function simpletabledraw() {
         if ((mime!='') && (ext!='true')) {
            parent.mapout.document.write
            ('<a target="preview" align="right" href="'+url+'.meta'+
-           '"><img src="'+iconpath+'meta.gif"></a><p>'+
+           '"><img width=20 src="'+iconpath+'meta.gif"></a><p>'+
            '<a target="preview" align="right"href="'+url+
-           '"><img src="'+iconpath+mime+'.gif"></a><p>');
+           '"><img width=20 src="'+iconpath+mime+'.gif"></a><p>');
         }        
       parent.mapout.document.write('<b>'+k+'</b></td><td bgcolor="'+ck+'">');
       data2=obj[i].split('&');