Diff for /loncom/interface/lonindexer.pm between versions 1.140 and 1.141

version 1.140, 2006/03/06 18:23:10 version 1.141, 2006/03/16 22:42:58
Line 116  sub handler { Line 116  sub handler {
     my $closebutton='';      my $closebutton='';
     my $groupimportbutton='';      my $groupimportbutton='';
     my $colspan='';       my $colspan=''; 
       
     $extrafield='';      $extrafield='';
     my $diropendb =       my $diropendb = 
  "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";   "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";
Line 133  sub handler { Line 133  sub handler {
     {      {
  if ($env{'form.launch'} eq '1') {   if ($env{'form.launch'} eq '1') {
     &start_fresh_session();      &start_fresh_session();
    }   }
   #Hijack lonindexer to verify a title and be close down.    #Hijack lonindexer to verify a title and be close down.
    if ($env{'form.launch'} eq '2') {     if ($env{'form.launch'} eq '2') {
        &Apache::loncommon::content_type($r,'text/html');         &Apache::loncommon::content_type($r,'text/html');
Line 145  sub handler { Line 145  sub handler {
    $verify_title=~s/'/\\'/g;     $verify_title=~s/'/\\'/g;
    $extra='window.opener.document.forms["'.$env{'form.form'}.'"].elements["'.$env{'form.titleelement'}.'"].value=\''.$verify_title.'\';';     $extra='window.opener.document.forms["'.$env{'form.form'}.'"].elements["'.$env{'form.titleelement'}.'"].value=\''.$verify_title.'\';';
        }         }
        my $html=&Apache::lonxml::xmlbegin();         my $js = <<ENDSUBM;
        $r->print(<<ENDSUBM);  
    $html  
      <!-- Generated by lonindexer.pm -->  
      <head>  
        <script type="text/javascript">         <script type="text/javascript">
  function load() {   function load() {
  window.opener.document.forms["$env{'form.form'}"]   window.opener.document.forms["$env{'form.form'}"]
Line 159  sub handler { Line 155  sub handler {
  window.close();   window.close();
  }   }
           </script>            </script>
      </head>  
     <body onLoad="load();">  
       </body>  
     </html>  
 ENDSUBM  ENDSUBM
          $r->print(&Apache::loncommon::start_page(undef,$js,
    {'only_body'   =>1,
    'add_entries' =>
        'onLoad="load();"',}).
    &Apache::loncommon::end_page());
        return OK;         return OK;
    }     }
           
Line 347  END Line 344  END
  }   }
   
 # ---------------------------------------------------------------- Print Header  # ---------------------------------------------------------------- Print Header
  my $html=&Apache::lonxml::xmlbegin();   my $js = <<"ENDHEADER";
  $r->print(<<ENDHEADER);  
 $html  
 <head>  
 <title>The LearningOnline Network With CAPA Directory Browser</title>  
   
 <!-- Generated by lonindexer.pm -->  
   
 <script type="text/javascript">  <script type="text/javascript">
 $catalogmodefunctions  $catalogmodefunctions
 function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {  function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
Line 372  function gothere(val) { Line 362  function gothere(val) {
     window.location=val+'?acts='+document.forms.fileattr.acts.value;      window.location=val+'?acts='+document.forms.fileattr.acts.value;
 }  }
 </script>  </script>
   
 </head>  
 ENDHEADER  ENDHEADER
 my ($headerdom)=($uri=~/^\/res\/(\w+)\//);  
 $r->print(&Apache::loncommon::bodytag('Browse Resources',undef,undef,undef,          my ($headerdom)=($uri=~/^\/res\/(\w+)\//);
       $headerdom));   $r->print(&Apache::loncommon::start_page('Browse Resources',$js,
    {'domain' => $headerdom,}));
 # - Evaluate actions from previous page (both cumulatively and chronologically)  # - Evaluate actions from previous page (both cumulatively and chronologically)
         if ($env{'form.catalogmode'} eq 'groupimport') {          if ($env{'form.catalogmode'} eq 'groupimport') {
     my $acts=$env{'form.acts'};      my $acts=$env{'form.acts'};
Line 598  END Line 587  END
  $r->print('</td></tr></table>');   $r->print('</td></tr></table>');
   
 # --------------------------------------------------- end the output and return  # --------------------------------------------------- end the output and return
  $r->print('</body></html>'."\n");   $r->print(&Apache::loncommon::end_page()."\n");
     }      }
     if(! $c->aborted()) {      if(! $c->aborted()) {
 # write back into the temporary file  # write back into the temporary file
Line 721  sub dynmetaread { Line 710  sub dynmetaread {
 }  }
   
 sub initdebug {  sub initdebug {
     my $html=&Apache::lonxml::xmlbegin();      my $start_page=
    &Apache::loncommon::start_page('Debug',undef,
          {'only_body' => 1,});
       $start_page =~ s/\n/ /g;
     return <<ENDJS;      return <<ENDJS;
 <script>  <script type="text/javascript">
 var debugging = true;  var debugging = true;
 if (debugging) {  if (debugging) {
     var debuggingWindow = window.open('','Debug','width=400,height=300',true);      var debuggingWindow = window.open('','Debug','width=400,height=300',true);
Line 734  function output(text) { Line 726  function output(text) {
         debuggingWindow.document.writeln(text);          debuggingWindow.document.writeln(text);
     }      }
 }  }
 output('$html<head><title>Debugging Window</title><!-- for lonindexer.pm --></head><body><pre>');     output('$start_page<pre>');   
 </script>  </script>
 ENDJS  ENDJS
 }  }
   
 sub writedebug {  sub writedebug {
     my $text = shift;      my ($text) = @_;
     return "<script>output('$text');</script>";      return "<script type=\"text/javascript\">output('$text');</script>";
 }  }
   
 # -------------------- filters out files based on extensions (returns an array)  # -------------------- filters out files based on extensions (returns an array)

Removed from v.1.140  
changed lines
  Added in v.1.141


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>