[BACK]Return to lonsql CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/lonsql between versions 1.44 and 1.46

version 1.44, 2002/06/17 14:00:09 version 1.46, 2002/06/18 15:04:05
Line 189  sub logthis { Line 189  sub logthis {
     my $local=localtime($now);      my $local=localtime($now);
     print $fh "$local ($$): $message\n";      print $fh "$local ($$): $message\n";
 }  }
   
   # ------------------------------------------------------------------ Course log
   
   sub courselog {
       my ($path,$command)=@_;
       my %filters=();
       foreach (split(/\=/,&unescape($command))) {
    my ($name,$value)=split(/\=/,$_);
           $filters{$name}=$value;
       }
       my @results=();
       open(IN,$path.'/activity.log') or return ('file_error');
       while ($line=<IN>) {
           chomp($line);
           my ($timestamp,$host,$log)=split(/\:/,$line);
           foreach (split(/\&/,&unescape($log))) {
       my ($res,$uname,$udom,$action,$values)=split(/\:/,$_);
               my $include=1;
           }
       }
       close IN;
       return join('&',sort(@results));
   }
   
   # -------------------------------------------------------------------- User log
   
   sub userlog {
       my ($path,$command)=@_;
       my %filters=();
       foreach (split(/\=/,&unescape($command))) {
    my ($name,$value)=split(/\=/,$_);
           $filters{$name}=$value;
       }
       my @results=();
       open(IN,$path.'/activity.log') or return ('file_error');
       while ($line=<IN>) {
           chomp($line);
           my ($timestamp,$host,$log)=split(/\:/,$line);
           $log=&unescape($log);
           my $include=1;
           if (($filters{'action'} eq 'log') && ($log!~/^Log/)) { $include=0; }
           if ($include) {
      push(@results,$timestamp.':'.$log);
           }
       }
       close IN;
       return join('&',sort(@results));
   }
   
   
 # ---------------------------------------------------- Fork once and dissociate  # ---------------------------------------------------- Fork once and dissociate
 $fpid=fork;  $fpid=fork;
 exit if $fpid;  exit if $fpid;
Line 276  sub make_new_child { Line 326  sub make_new_child {
     my $userinput = <$client>;      my $userinput = <$client>;
     chomp($userinput);      chomp($userinput);
                   
     my ($conserver,$querytmp,      my ($conserver,$query,
  $customtmp,$customshowtmp)=split(/&/,$userinput);   $arg1,$arg2,$arg3)=split(/&/,$userinput);
     my $query=unescape($querytmp);      my $query=unescape($query);
     my $custom=unescape($customtmp);  
     my $customshow=unescape($customshowtmp);  
   
             #send query id which is pid_unixdatetime_runningcounter              #send query id which is pid_unixdatetime_runningcounter
     $queryid = $thisserver;      $queryid = $thisserver;
Line 292  sub make_new_child { Line 340  sub make_new_child {
     &logthis("QUERY: $query");      &logthis("QUERY: $query");
     sleep 1;      sleep 1;
   
               my $result='';
   
 # ---------- At this point, query is received, query-ID assigned and sent back   # ---------- At this point, query is received, query-ID assigned and sent back 
 # $query eq 'logquery' will mean that this is a query against log-files  # $query eq 'logquery' will mean that this is a query against log-files
   
           unless ($query eq 'logquery') {  
      if (($query eq 'userlog') || ($query eq 'courselog')) {
   # ----------------------------------------------------- beginning of log query
   #
   # this goes against a user's log file
   #
          my $udom=&unescape($arg1);
          my $uname=&unescape($arg2);
                  my $command=&unescape($arg3);
                  my $path=&propath($udom,$uname);
                  if (-e "$path/activity.log") {
      if ($query eq 'userlog') {
                          $result=&userlog($path,$command);
                      } else {
                          $result=&courselog($path,$command);
                      }
                  } else {
      &logthis('Unable to do log query: '.$uname.'@'.$udom);
              $result='no_such_file';
          }
   # ------------------------------------------------------------ end of log query
             } else {
 # -------------------------------------------------------- This is an sql query  # -------------------------------------------------------- This is an sql query
       my $custom=unescape($arg1);
       my $customshow=unescape($arg2);
             #prepare and execute the query              #prepare and execute the query
     my $sth = $dbh->prepare($query);      my $sth = $dbh->prepare($query);
     my $result;  
     my @files;      my @files;
     my $subsetflag=0;      my $subsetflag=0;
     if ($query) {      if ($query) {
Line 377  sub make_new_child { Line 450  sub make_new_child {
  $result.=$customresult;   $result.=$customresult;
     }      }
 # ------------------------------------------------------------ end of sql query  # ------------------------------------------------------------ end of sql query
  } else {     }
 # ------------------------------------------------------ beginning of log query  
 #              # result does need to be escaped
 # do log queries here  
 #              $result=&escape($result);
     $result='not_yet_implemented';  
 # ------------------------------------------------------------ end of log query  
  }  
     # reply with result, append \n unless already there      # reply with result, append \n unless already there
   
     $result.="\n" unless ($result=~/\n$/);      $result.="\n" unless ($result=~/\n$/);
             &reply("queryreply:$queryid:$result",$conserver);              &reply("queryreply:$queryid:$result",$conserver);
   
Removed from v.1.44  
changed lines
  Added in v.1.46

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