Diff for /loncom/lonsql between versions 1.40 and 1.44

version 1.40, 2001/11/29 14:59:52 version 1.44, 2002/06/17 14:00:09
Line 3 Line 3
 # The LearningOnline Network  # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.  # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #  #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # YEAR=2000  # YEAR=2000
 # lonsql-based on the preforker:harsha jagasia:date:5/10/00  # lonsql-based on the preforker:harsha jagasia:date:5/10/00
 # 7/25 Gerd Kortemeyer  # 7/25 Gerd Kortemeyer
Line 11 Line 35
 # many different dates Scott Harrison  # many different dates Scott Harrison
 # 03/22/2001 Scott Harrison  # 03/22/2001 Scott Harrison
 # 8/30 Gerd Kortemeyer  # 8/30 Gerd Kortemeyer
 # 10/17,11/28,11/29 Scott Harrison  # 10/17,11/28,11/29,12/20 Scott Harrison
   # YEAR=2001
   # 5/11 Scott Harrison
 #  #
 # $Id$  
 ###  ###
   
 ###############################################################################  ###############################################################################
Line 21 Line 46
 ## ORGANIZATION OF THIS PERL SCRIPT                                          ##  ## ORGANIZATION OF THIS PERL SCRIPT                                          ##
 ## 1. Modules used                                                           ##  ## 1. Modules used                                                           ##
 ## 2. Enable find subroutine                                                 ##  ## 2. Enable find subroutine                                                 ##
 ## 3. Read httpd access.conf and get variables                               ##  ## 3. Read httpd config files and get variables                              ##
 ## 4. Make sure that database can be accessed                                ##  ## 4. Make sure that database can be accessed                                ##
 ## 5. Make sure this process is running from user=www                        ##  ## 5. Make sure this process is running from user=www                        ##
 ## 6. Check if other instance is running                                     ##  ## 6. Check if other instance is running                                     ##
Line 29 Line 54
 ##                                                                           ##  ##                                                                           ##
 ###############################################################################  ###############################################################################
   
   use lib '/home/httpd/lib/perl/';
   use LONCAPA::Configuration;
   
 use IO::Socket;  use IO::Socket;
 use Symbol;  use Symbol;
 use POSIX;  use POSIX;
Line 52  sub wanted { Line 80  sub wanted {
 $childmaxattempts=10;  $childmaxattempts=10;
 $run =0;#running counter to generate the query-id  $run =0;#running counter to generate the query-id
   
 # ------------------------------------ Read httpd access.conf and get variables  # -------------------------------- Read loncapa_apache.conf and loncapa.conf
 open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";  my $perlvarref=LONCAPA::Configuration::read_conf('loncapa_apache.conf',
                                                    'loncapa.conf');
 while ($configline=<CONFIG>) {  my %perlvar=%{$perlvarref};
     if ($configline =~ /PerlSetVar/) {  
  my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);  
         chomp($varvalue);  
         $perlvar{$varname}=$varvalue;  
     }  
 }  
 close(CONFIG);  
   
 # ------------------------------------- Make sure that database can be accessed  # ------------------------------------- Make sure that database can be accessed
 {  {
Line 269  sub make_new_child { Line 290  sub make_new_child {
     print $client "$queryid\n";      print $client "$queryid\n";
           
     &logthis("QUERY: $query");      &logthis("QUERY: $query");
     &logthis("QUERY: $query");  
     sleep 1;      sleep 1;
   
   # ---------- 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
   
             unless ($query eq 'logquery') {
   # -------------------------------------------------------- This is an sql query
             #prepare and execute the query              #prepare and execute the query
     my $sth = $dbh->prepare($query);      my $sth = $dbh->prepare($query);
     my $result;      my $result;
Line 285  sub make_new_child { Line 311  sub make_new_child {
  else {   else {
     my $r1=$sth->fetchall_arrayref;      my $r1=$sth->fetchall_arrayref;
     my @r2;      my @r2;
     map {my $a=$_;       foreach (@$r1) {my $a=$_; 
  my @b=map {escape($_)} @$a;   my @b=map {escape($_)} @$a;
  push @files,@{$a}[3];   push @files,@{$a}[3];
  push @r2,join(",", @b)   push @r2,join(",", @b)
  } (@$r1);   }
     $result=join("&",@r2);      $result=join("&",@r2);
  }   }
     }      }
Line 337  sub make_new_child { Line 363  sub make_new_child {
     my $sth = $dbh->prepare($q2);      my $sth = $dbh->prepare($q2);
     $sth->execute();      $sth->execute();
     my $r1=$sth->fetchall_arrayref;      my $r1=$sth->fetchall_arrayref;
     map {my $a=$_;       foreach (@$r1) {my $a=$_; 
  my @b=map {escape($_)} @$a;   my @b=map {escape($_)} @$a;
  push @files,@{$a}[3];   push @files,@{$a}[3];
  push @r2,join(",", @b)   push @r2,join(",", @b)
  } (@$r1);   }
  }   }
 # &logthis("found: $stuff");  # &logthis("found: $stuff");
  $customresult.='&custom='.escape($m2).','.escape($stuff);   $customresult.='&custom='.escape($m2).','.escape($stuff);
Line 350  sub make_new_child { Line 376  sub make_new_child {
  $result=join("&",@r2) unless $query;   $result=join("&",@r2) unless $query;
  $result.=$customresult;   $result.=$customresult;
     }      }
     # reply with result  # ------------------------------------------------------------ end of sql query
     $result.="\n" if $result;   } else {
   # ------------------------------------------------------ beginning of log query
   #
   # do log queries here
   #
       $result='not_yet_implemented';
   # ------------------------------------------------------------ end of log query
    }
       # reply with result, append \n unless already there
       $result.="\n" unless ($result=~/\n$/);
             &reply("queryreply:$queryid:$result",$conserver);              &reply("queryreply:$queryid:$result",$conserver);
   
         }          }
Line 491  the parent process. Line 526  the parent process.
   
 =head1 DESCRIPTION  =head1 DESCRIPTION
   
 LON TCP-MySQL-Server Daemon for handling database requests.  Not yet written.
   
 =head1 README  =head1 README
   
 LON TCP-MySQL-Server Daemon for handling database requests.  Not yet written.
   
 =head1 PREREQUISITES  =head1 PREREQUISITES
   

Removed from v.1.40  
changed lines
  Added in v.1.44


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