[Genex-cvs-commit] genex-server/site/webtools runtree.pl,1.1.2.1,1.1.2.2

[<td...@us...>]

Update of /cvsroot/genex/genex-server/site/webtools
In directory usw-pr-cvs1:/tmp/cvs-serv16958

Modified Files:
      Tag: Rel-1_0_1-branch
	runtree.pl 
Log Message:
Syntax etc.

Index: runtree.pl
===================================================================
RCS file: /cvsroot/genex/genex-server/site/webtools/Attic/runtree.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** runtree.pl	15 Nov 2002 20:16:45 -0000	1.1.2.1
--- runtree.pl	15 Nov 2002 21:54:53 -0000	1.1.2.2
***************
*** 44,50 ****
      $sth->execute();
  
!     my ($tree_pk, $name, $fi_input_fk) =
           $sth->fetchrow_array();
!     # TODO - die if bad tree name
  
      if ($sth->fetchrow_array())
--- 44,54 ----
      $sth->execute();
  
!     my ($tree_pk, $name) =
           $sth->fetchrow_array();
!     if (!defined($name))
!     {
!         $dbh->disconnect;
!         die "Tree: $treeName doesn't exist in db";
!     }
  
      if ($sth->fetchrow_array())
***************
*** 54,87 ****
  
      # determine log name
! 
!     my $logfile = "./treelog.txt";
      open(LOG, "> $logfile") or die "Unable to open $logfile: $!\n";
      print LOG `date`;
      print LOG "\n Running tree: $treeName owner: $treeOwner\n";
  
!     processTree($dbh, $tree_pk, $fi_input_fk, LOG);
      close(LOG);
      
      # TODO - stat logfile
  
!     # TODO -  insert logfile into file_info
!     #my $fields = "('file_name','timestamp', 'owner', 'comments', 'checksum')";
!     $stm = "insert into file_info (file_name) values ($logfile)";
!     $sth = $dbh->prepare($stm);
!     $sth->execute();
!     $dbh->commit();
! 
!     $stm = "select from file_info where 'file_name' = $filename";
!     $sth = $dbh->prepare($stm);
!     $sth->execute;
!     
!     my $fi_pk = $sth->fetchrow_array;
!     
!     #update tree record with logfile fk
!     $stm = "update tree set fi_log_fk = $fi_pk";
!     $sth = $dbh->prepare($stm);
!     $sth->execute();
!     $dbh->commit();
! 
      $dbh->disconnect();
  } #runChain
--- 58,76 ----
  
      # determine log name
!     $stm="select file_name from file_info,tree where fi_pk = fi_log_fk";
!     $sth=$dbh->prepare($stm);
!     $sth->execute;
!     
!     my ($logfile) = $sth->fetchrow_array;
      open(LOG, "> $logfile") or die "Unable to open $logfile: $!\n";
      print LOG `date`;
      print LOG "\n Running tree: $treeName owner: $treeOwner\n";
  
!     processTree($dbh, $tree_pk, LOG);
      close(LOG);
      
      # TODO - stat logfile
  
!     $sth->finish; 
      $dbh->disconnect();
  } #runChain
***************
*** 89,96 ****
  sub processTree
  {
!     my ($dbh, $tree_pk, $fi_input_fk, $logfile) = @_;
      my ($stm, $sth);
  
!     print $logfile "Processing tree pk: $tree_pk input: $fi_input_fk\n";
      
      $stm="select node_pk, an_fk from node" .
--- 78,85 ----
  sub processTree
  {
!     my ($dbh, $tree_pk, $logfile) = @_;
      my ($stm, $sth);
  
!     print $logfile "Processing tree pk: $tree_pk\n";
      
      $stm="select node_pk, an_fk from node" .
***************
*** 290,294 ****
    while (my ($fileprefix) = $sth2->fetchrow_array)
    {
!     $userParams =~ /$fileprefix\s*([\S]+)\s/;
      my $filename = $1;
      insertFile($dbh, $node_pk, $filename);
--- 279,283 ----
    while (my ($fileprefix) = $sth2->fetchrow_array)
    {
!     $userParams =~ /$fileprefix\s*'+([\S]+)'+\s/;
      my $filename = $1;
      insertFile($dbh, $node_pk, $filename);