--- rat/lonratedt.pm	2002/05/22 20:39:59	1.27
+++ rat/lonratedt.pm	2002/09/04 16:54:44	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.27 2002/05/22 20:39:59 www Exp $
+# $Id: lonratedt.pm,v 1.36 2002/09/04 16:54:44 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,9 +36,11 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::lonnet;
 use Apache::lonratsrv;
+use Apache::lonsequence;
+use Apache::loncommon;
+use File::Copy;
 
-my @order;
-my @resources;
+use vars qw(@order @resources);
 
 
 # Mapread read maps into global arrays @links and @resources, determines status
@@ -67,6 +69,9 @@ sub mapread {
         if ($command eq 'objlinks') {
             $links[$number]=$content;
         }
+        if ($command eq 'objparms') {
+	    return('Map has resource parameters. Use advanced editor.',1);
+        }
     }
 # ------------------------------------------------------- Is this a linear map?
     my @starters=();
@@ -129,7 +134,9 @@ sub mapread {
 }
 
 # ---------------------------------------------- Read a map as well as possible
-
+# Also used by the sequence handler
+# Call lonsequence::attemptread to read from resource space
+#
 sub attemptread {
     my $fn=shift;
 
@@ -263,7 +270,6 @@ ENDDOCUMENT
 # ---------------------------------------------------------------- Make buttons
 
 sub buttons {
-    if ($ENV{'form.forceselect'}) { return ''; }
     my $adv=shift;
     my $output='<form method=post>';     
     if ($adv==1) {
@@ -313,6 +319,10 @@ sub startfinish {
     }
    my ($name,$url,$ext)=split(/\:/,$resources[$order[0]]);
    $resources[$order[0]]=$name.':'.$url.':'.$ext.':start:res';
+   if ($#order==0) {
+       $resources[$#resources+1]='::false';
+       $order[1]=$#resources;
+   }
    my ($name,$url,$ext)=split(/\:/,$resources[$order[$#order]]);
    $resources[$order[$#order]]=$name.':'.$url.':'.$ext.':finish:res';
 }
@@ -320,7 +330,17 @@ sub startfinish {
 # ------------------------------------------------------------------- Store map
 
 sub storemap {
-    my $fn=shift;
+    my $realfn=shift;
+    my $fn=$realfn;
+# unless this is forced to work from the original file, use a temporary file
+# instead
+    unless (shift) {
+       $fn=$realfn.'.tmp';
+       unless (-e $fn) {
+	  copy($realfn,$fn);
+       }
+    }
+# store data either into tmp or real file
     &startfinish();
     my $output='graphdef<:>no';
     my $k=1;
@@ -342,12 +362,138 @@ sub storemap {
      &Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,''));
 }
 
+sub editscript {
+    my $mode=shift;
+    return(<<ENDSCRIPT);
+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='';
+
+// ------------------------------------------------------ Clears indexer window
+function idxclear() {
+  idx.document.clear();
+}
+
+// ------------------------------------------------------- Clears search window
+function srchclear() {
+  srch.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();
+  }
+}
+
+// -------------------------------------------------------- Open indexer window
+function idxopen(mode) {
+   var options="scrollbars=1,resizable=1,menubar=0";
+   idxmode=mode;
+   idxflag=1;
+   idx=open("/res/?launch=1&mode=$mode&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?launch=1&mode=$mode&catalogmode="+mode,"srchout",options);
+   srch.focus();
+}
+// ----------------------------------------------------- launch indexer browser
+function groupsearch() {
+   srchcheck('groupsearch');
+}
+
+function groupimport() {
+   idxcheck('groupimport');
+}
+// ------------------------------------------------------- Do srch status check
+function srchcheck(mode) {
+   if (!srch || srch.closed || srchmode!=mode) {
+      srchopen(mode);
+   }
+   srch.focus();
+}
+
+// -------------------------------------------------------- Do idx status check
+function idxcheck(mode) {
+   if (!idx || idx.closed || idxmode!=mode) {
+      idxopen(mode);
+   }
+   idx.focus();
+}
+
+
+    var editbrowser;
+    function openbrowser(formname,elementname,only,omit) {
+        var url = '/res/?';
+        if (editbrowser == null) {
+            url += 'launch=1&';
+        }
+        url += 'catalogmode=interactive&';
+        url += 'mode=edit&';
+        url += 'form=' + formname + '&';
+        if (only != null) {
+            url += 'only=' + only + '&';
+        } 
+        if (omit != null) {
+            url += 'omit=' + omit + '&';
+        }
+        url += 'element=' + elementname + '';
+        var title = 'Browser';
+        var options = 'scrollbars=1,resizable=1,menubar=0';
+        options += ',width=700,height=600';
+        editbrowser = open(url,title,options,'1');
+        editbrowser.focus();
+    }
+ENDSCRIPT
+}
 # ------------------------------------------------------- Simple edit processor
 
 sub smpedt {
    my ($r,$url,$errtext)=@_;
    my $buttons=&buttons(2);
-
+   my $tmpfn=&Apache::lonnet::filelocation('',$url).'.tmp';
+   my $targetmsg='';
+   if ($ENV{'form.save'}) {
+       $targetmsg='<b>Saving ...</b><br>';
+       copy($tmpfn,&Apache::lonnet::filelocation('',$url));
+       unlink($tmpfn);
+       my ($errtext,$fatal)=
+                           &mapread(&Apache::lonnet::filelocation('',$url),'');
+   }
+   if ($ENV{'form.revert'}) {
+       $targetmsg='<b>Reverting ...</b><br>';
+       unlink($tmpfn);
+       my ($errtext,$fatal)=
+                           &mapread(&Apache::lonnet::filelocation('',$url),'');
+   }
+   if (-e $tmpfn) {
+      $targetmsg=
+        '<b><font color="red">You are working with an unsaved version of your map.</font></b><br>';
+      my ($errtext,$fatal)=&mapread($tmpfn,'');
+   }
 # ---------------------------------------------------------- Process form input
 
    my @importselect=();
@@ -442,7 +588,7 @@ sub smpedt {
        }
 
        foreach (
-    &attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
+    &Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
 	   my ($name,$url)=split(/\:/,$_);
            if ($url) {
               $importdetail.='&'.&Apache::lonnet::escape($name).'='.
@@ -539,7 +685,11 @@ sub smpedt {
 # ------------------------------------------------------------ Assemble windows
    
    my $idx=-1;
-   my $importwindow=join("\n",map {
+   $importdetail='&'.$importdetail;
+   $importdetail=~s/^\&+/\&/;
+   my $importwindow=
+       '<option value="-1"> ---- Import and Paste Area ---- </option>'.
+     join("\n",map {
        $idx++;
        if ($_) { 
           my ($name,$url)=split(/\=/,$_);
@@ -551,7 +701,9 @@ sub smpedt {
    } split(/\&/,$importdetail));
 
    $idx=0;
-   my $targetwindow=join("\n",map { 
+   my $targetwindow=       
+       '<option value="0"> ------- Target Edit Map ------- </option>'.
+     join("\n",map { 
        my ($name,$url)=split(/\:/,$resources[$_]);
        unless ($name) {  $name=(split(/\//,$url))[-1]; }
        unless ($name) { $name='EMPTY'; }
@@ -562,112 +714,14 @@ sub smpedt {
    } @order);
 
 # ----------------------------------------------------- Start simple RAT screen
+   my $editscript=&editscript('simple');
+   my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
    $r->print(<<ENDSMPHEAD);
 <html>
 <head>
 <script>
-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='';
-
-// ------------------------------------------------------ Clears indexer window
-function idxclear() {
-  idx.document.clear();
-}
-
-// ------------------------------------------------------- Clears search window
-function srchclear() {
-  srch.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();
-  }
-}
-
-// -------------------------------------------------------- Open indexer window
-function idxopen(mode) {
-   var options="scrollbars=1,resizable=1,menubar=0";
-   idxmode=mode;
-   idxflag=1;
-   idx=open("/res/?launch=1&mode=simple&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?launch=1&mode=simple&catalogmode="+mode,"srchout",options);
-   srch.focus();
-}
-// ----------------------------------------------------- launch indexer browser
-function groupsearch() {
-   srchcheck('groupsearch');
-}
-
-function groupimport() {
-   idxcheck('groupimport');
-}
-// ------------------------------------------------------- Do srch status check
-function srchcheck(mode) {
-   if (!srch || srch.closed || srchmode!=mode) {
-      srchopen(mode);
-   }
-   srch.focus();
-}
-
-// -------------------------------------------------------- Do idx status check
-function idxcheck(mode) {
-   if (!idx || idx.closed || idxmode!=mode) {
-      idxopen(mode);
-   }
-   idx.focus();
-}
 
-
-    var editbrowser;
-    function openbrowser(formname,elementname,only,omit) {
-        var url = '/res/?';
-        if (editbrowser == null) {
-            url += 'launch=1&';
-        }
-        url += 'catalogmode=interactive&';
-        url += 'mode=edit&';
-        url += 'form=' + formname + '&';
-        if (only != null) {
-            url += 'only=' + only + '&';
-        } 
-        if (omit != null) {
-            url += 'omit=' + omit + '&';
-        }
-        url += 'element=' + elementname + '';
-        var title = 'Browser';
-        var options = 'scrollbars=1,resizable=1,menubar=0';
-        options += ',width=700,height=600';
-        editbrowser = open(url,title,options,'1');
-        editbrowser.focus();
-    }
+   $editscript
 
    function openview(entry) {
        var url=unescape((entry.split('='))[1]);
@@ -679,19 +733,20 @@ function idxcheck(mode) {
 
    function viewtarget() {
        openview((document.forms.simpleedit.targetdetail.value.split('&'))
-                [document.forms.simpleedit.target.selectedIndex+1]);
+                [document.forms.simpleedit.target.selectedIndex]);
    }
 
    function viewimport() {
        openview((document.forms.simpleedit.curimpdetail.value.split('&'))
-                [document.forms.simpleedit.importsel.selectedIndex+1]);
+                [document.forms.simpleedit.importsel.selectedIndex]);
    }
 
 </script>
 </head>                 
-<body bgcolor='#FFFFFF'>
+$bodytag
 $buttons
 <font color=red>$errtext</font>
+<h1>$url</h1>
 <form name=simpleedit method=post>
 <input type=hidden name=forcesmp value=1>
 <table>
@@ -699,8 +754,8 @@ $buttons
 <th>&nbsp;</th>
 <th width="40%">Target</th></tr>
 <tr><td bgcolor="#FFFFCC">
-<input type=button onClick="javascript:groupsearch()" value="Group Search">
-<input type=button onClick="javascript:groupimport();" value="Group Import">
+<input type=button onClick="javascript:groupsearch()" value="Search">
+<input type=button onClick="javascript:groupimport();" value="Import">
 after selected
 <hr>
 <input type=text size=20 name=importmap>
@@ -718,7 +773,10 @@ value="Browse"><input type=submit name=l
 <input type=button onClick=
 "javascript:impfortarget.value=1;groupimport();" value="Group Import">
 after selected
-<hr><input type=button onClick="javascript:viewtarget()" value="View">
+<hr>$targetmsg
+<input type=submit name="revert" value="Revert to Last Saved">
+<input type=submit name="save" value="Save">
+<input type=button onClick="javascript:viewtarget()" value="View">
 </td></tr>
 
 <tr><td bgcolor="#FFFFCC"><select name="importsel" size=10 multiple>
@@ -765,73 +823,28 @@ ENDNODIR
 
 sub viewmap {
     my ($r,$url,$adv,$errtext)=@_;
-    $r->print('<html>');
-    if ($ENV{'form.forceselect'}) { $r->print(<<ENDSCRIPT);
-<script>
-
-function select_group() {
-    window.location="/adm/groupsort?catalogmode=groupimport&mode=rat&acts="+document.forms.fileattr.acts.value;
-}
-
-function queue(val) {
-    if (eval("document.forms."+val+".filelink.checked")) {
-	var l=val.length;
-	var v=val.substring(4,l);
-	document.forms.fileattr.acts.value+='1a'+v+'b';
-    }
-    else {
-	var l=val.length;
-	var v=val.substring(4,l);
-	document.forms.fileattr.acts.value+='0a'+v+'b';
-    }
-}
-
-
-
-</script>
-ENDSCRIPT
-    }
-    $r->print('<body bgcolor="#FFFFFF">'.&buttons($adv));
-    if ($ENV{'form.forceselect'}) { $r->print(<<ENDSELECT);
-<form name=fileattr><input type=hidden name=acts value=''>
-<input type="button" name="close" value='CLOSE' onClick="self.close()">
-<input type="button" name="groupimport" value='GROUP IMPORT'
-onClick="javascript:select_group()">
-</form>   
-ENDSELECT
-    }
+    $r->print('<html>'.
+     &Apache::loncommon::bodytag('Edit Content of a Map').
+     &buttons($adv));
     if ($errtext) {
 	$r->print($errtext.'<hr>');
     }
     my $idx=0;
+    $r->print('<h1>'.$url.'</h1>');
     foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
 	if (defined($_)) {
             $idx++;
-            if ($ENV{'form.forceselect'}) { 
-		$r->print('<form name="form'.$idx.'">');
-            }
 	    my ($title,$url)=split(/\:/,$_);
             $title=~s/\&colon\;/\:/g;
             $url=~s/\&colon\;/\:/g;
             unless ($title) { $title=(split(/\//,$url))[-1] };
             unless ($title) { $title='<i>Empty</i>'; }
             if ($url) {
-		if ($ENV{'form.forceselect'}) {
-		    $r->print(<<ENDCHECKBOX);
-<input type='checkbox' name='filelink' 
-value='$url' onClick='javascript:queue("form$idx")' >
-<input type='hidden' name='title' value='$title'>
-ENDCHECKBOX
-                }
 		$r->print('<a href="'.&Apache::lonratsrv::qtescape($url).'">');
             }
             $r->print(&Apache::lonratsrv::qtescape($title));
             if ($url) { $r->print('</a>'); }
-            if ($ENV{'form.forceselect'}) {
-		$r->print('</form>');
-            } else {
-		$r->print('<br>');
-            }
+	    $r->print('<br>');
         }
     }
     $r->print('</body></html>');
@@ -845,9 +858,6 @@ sub handler {
   $r->send_http_header;
 
   return OK if $r->header_only;
- 
-  &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                          ['forceselect']);
 
   my $url=$r->uri;
   my $fn=&Apache::lonnet::filelocation('',$url);