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

Diff for /loncom/lonsql between versions 1.42 and 1.44

version 1.42, 2002/05/11 21:26:53 version 1.44, 2002/06/17 14:00:09
Line 46 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 80  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 access.conf and loncapa.conf  # -------------------------------- Read loncapa_apache.conf and loncapa.conf
 my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');  my $perlvarref=LONCAPA::Configuration::read_conf('loncapa_apache.conf',
                                                    'loncapa.conf');
 my %perlvar=%{$perlvarref};  my %perlvar=%{$perlvarref};
   
 # ------------------------------------- Make sure that database can be accessed  # ------------------------------------- Make sure that database can be accessed
Line 289  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 370  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);
   
         }          }
Removed from v.1.42  
changed lines
  Added in v.1.44

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