--- loncom/publisher/lonpubdir.pm	2005/04/07 06:56:26	1.78
+++ loncom/publisher/lonpubdir.pm	2005/05/20 18:28:22	1.81
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.78 2005/04/07 06:56:26 albertel Exp $
+# $Id: lonpubdir.pm,v 1.81 2005/05/20 18:28:22 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -223,12 +223,8 @@ parent.lastknownpriv='/~$uname$thisdisfn
 
     function currdiract(theform) {
         if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publish') {
-            document.publishdir.filename.value = theform.filename.value
-            pubdir(document.publishdir)
-        }
-        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publishsub') {
-            document.publishdir.filename.value = theform.filename.value
-            pubrecdir(document.publishdir)
+            document.publishdir.filename.value = theform.filename.value;
+	    document.publishdir.submit();
         }
         if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
             top.location=theform.filename.value+'default.meta'
@@ -239,26 +235,6 @@ parent.lastknownpriv='/~$uname$thisdisfn
         }
     }
   
-    function pubdir(theform) {
-	if (confirm('Publish complete directory?')) {
-            forcepub(theform)
-	    theform.submit();
-        }
-    }
-    function pubrecdir(theform) {
-	if (confirm('Publish directory and all subdirectories?')) {
-            forcepub(theform);
-            theform.pubrec.value='1';
-	    theform.submit();
-        }
-    }
-
-    function forcepub(theform) {
-        if (confirm('Force publication of unmodified files? -  Cancel=No; OK=yes.')) {
-            theform.forcerepub.value="ON";
-        } 
-    }
-
     function checkUpload(theform) {
         if (theform.file == '') {
             alert("Please use 'Browse..' to choose a file first, before uploading")
@@ -273,10 +249,7 @@ parent.lastknownpriv='/~$uname$thisdisfn
             return
         }
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
-            pubdir(theform)
-        }
-        if (theform.diraction.options[theform.diraction.selectedIndex].value == "publishsub") {
-            pubrecdir(theform)
+            theform.submit();
         }
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
             top.location=theform.filename.value+'default.meta'
@@ -306,7 +279,7 @@ parent.lastknownpriv='/~$uname$thisdisfn
       if (activity == 'obsolete') {
           var pubform = document.pubresource
           pubform.filename.value = theform.filename.value
-          alert("You will be taken to the publication page.\\nCheck the 'Obsolete' checkbox at the bottom of the page, and click 'Finalize Publication'.")
+          pubform.makeobsolete.value=1;
           pubform.submit()
       }
       if (activity == 'print') {
@@ -355,7 +328,6 @@ sub dircontrols {
            <select name="dirtask" onChange="currdiract(this.form)">
             <option>Select action</option>
             <option value="publish">Publish directory</option>
-            <option value="publishsub">Publish with subdirectories</option>
             <option value="editcat">Edit catalog information</option>
             <option value="printdir">Print contents of directory</option>
            </select>
@@ -364,7 +336,6 @@ sub dircontrols {
           <form name="publishdir" method="post" action="/adm/publish" target="_parent">
            <input type="hidden" name="pubrec" value="" />
            <input type="hidden" name="filename" value="" />
-           <input type="hidden" name="forcerepub" value="NO" />
           </form>
           <form name="printdir" method="post" action="/adm/printout" target="_parent">
            <input type="hidden" name="postdata" value="" />
@@ -405,12 +376,7 @@ sub pubbuttons {
     $r->print('<form method="post" action="/adm/publish" target="_parent">'.
               '<table><tr><td><input type="hidden" name="filename" value="/~'.
                $uname.$thisdisfn.'/" />'.
-              '<input type="button" onClick="pubdir(this.form);" value="'.
-&mt('Publish Directory').'" />'.
-              '<input type="hidden" name="pubrec" value="" />'.
-              '<input type="hidden" name="forcerepub" value="NO" />'.
-              '<input type="button" onClick="pubrecdir(this.form);" value="'.
-&mt('Publish Directory and Sub Directories').'" /></td><td>'.
+              '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
 '<input type="button" onClick="window.location='."'/~".
                $uname.$thisdisfn."/default.meta'".'" value="'.
 &mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
@@ -429,9 +395,8 @@ sub resourceactions {
          <input type="hidden" name="action" value="delete" />
        </form>
        <form name="pubresource" action="/adm/publish" target="_parent" method="post">
-         <input type="hidden" name="pubrec" value="" />
          <input type="hidden" name="filename" value="" />
-         <input type="hidden" name="forcerepub" value="NO" />
+         <input type="hidden" name="makeobsolete" value="0" />
        </form>
        <form name="printresource" action="/adm/printout" target="_parent" method="post">
            <input type="hidden" name="postdata" value="" />
@@ -518,8 +483,6 @@ sub putdirectory {
                     '</select>'.
                      '<input type="hidden" name="filename" value="'.$dirpath.'/'.$dirname.'/" />'.
                      '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
-                     '<input type="hidden" name="pubrec" value="" />'.
-                     '<input type="hidden" name="forcerepub" value="" />'.
                      '<input type="hidden" name="postdata" value="" />'.
                    '</form>';
             $$numdir ++;
@@ -545,6 +508,7 @@ sub putresource {
     my ($r, $udom, $uname, $filename, $thisdisfn, 
 	$resdir, $targetdir, $linkdir,
 	$cmtime,$bombs,$numres) = @_;
+    &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
     my $pubstatus = 'unpublished';
     my $status=&mt('Unpublished');
     my $bgcolor='#FFAA99';