genex-cvs-commit Mailing List for GeneX Gene Expression Database (Page 21)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
      Tag: Rel-1_0_1-branch
	edit_atree1.pl analysis_tree_lib.pl edit_atree2.pl 
	edit_atree1.html 
Log Message:
node inserts use default user_parameter_values
improve html


Index: edit_atree1.pl
===================================================================
RCS file: /cvsroot/genex/genex-server/site/webtools/Attic/edit_atree1.pl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** edit_atree1.pl	13 Dec 2002 17:12:40 -0000	1.1.2.6
--- edit_atree1.pl	13 Dec 2002 21:51:59 -0000	1.1.2.7
***************
*** 20,27 ****
      my $select_node = select_node($dbh);
  
!     if (exists($ch{node_pk}))
      {
! 	$properties = build_properties($dbh, $ch{node_pk});
      }
  
      (my $all_html) = readtemplate("edit_atree1.html");
--- 20,28 ----
      my $select_node = select_node($dbh);
  
!     if (! exists($ch{node_pk}))
      {
! 	$ch{node_pk} = $tree{root};
      }
+     $properties = build_properties($dbh, $ch{node_pk});
  
      (my $all_html) = readtemplate("edit_atree1.html");
***************
*** 49,52 ****
--- 50,54 ----
      $sth->execute($node_pk) || die "Query execute get_upn fails.\n$DBI::errstr\n";
      $results = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
+     $results .= "<td>($node_pk)</td><td></td>\n";
      my $hr; # hashref
      while( $hr = $sth->fetchrow_hashref())
***************
*** 54,58 ****
  	if ($hr->{up_type} eq "text")
  	{
! 	    $results .= "<tr><td valign=\"top\">$hr->{up_display_name} &nbsp;&nbsp;&nbsp;<br><br></td><td  valign=\"top\"><input type=\"text\" name=\"$hr->{up_name}\" value=\"$hr->{up_value}\"></td></tr>\n";
  	}
      }
--- 56,60 ----
  	if ($hr->{up_type} eq "text")
  	{
! 	    $results .= "<tr><td valign=\"top\">$hr->{up_display_name} &nbsp;&nbsp;&nbsp;<br><br></td><td  valign=\"top\"><input type=\"text\" name=\"$hr->{up_name}\" value=\"$hr->{up_value}\" size=\"30\" maxlength=\"128\"></td></tr>\n";
  	}
      }

Index: analysis_tree_lib.pl
===================================================================
RCS file: /cvsroot/genex/genex-server/site/webtools/Attic/analysis_tree_lib.pl,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -C2 -d -r1.1.2.35 -r1.1.2.36
*** analysis_tree_lib.pl	13 Dec 2002 17:12:44 -0000	1.1.2.35
--- analysis_tree_lib.pl	13 Dec 2002 21:51:59 -0000	1.1.2.36
***************
*** 240,245 ****
      {
  	$sth = getq("insert_tree_node", $dbh);
! 	#  tree_fk, parent_fk, an_fk
! 	$sth->execute($tree{tree_pk},  $tree{add_parent}, $tree{add_an_fk});
      }
      elsif (exists($tree{update_node_pk}))
--- 240,258 ----
      {
  	$sth = getq("insert_tree_node", $dbh);
! 	$sth->execute($tree{tree_pk},  $tree{add_parent}, $tree{add_an_fk}); # my tree's tree_pk, my parent's node_pk, analysis an_pk
! 	my $us_fk = get_us_fk($dbh);
!  	my $node_pk = insert_security($dbh, $us_fk, $us_fk, 0);
! 	
! 	$sth = getq("default_upv", $dbh);
! 	$sth->execute($tree{add_an_fk}) || die "Query default_upv execute error. $DBI::errstr\n";
! 	
! 	my $sth_insert = getq("insert_upv", $dbh);
! 	my $hr;
! 	while ($hr = $sth->fetchrow_hashref())
! 	{
! 	    $sth_insert->execute($node_pk,
! 				 $hr->{up_default},
! 				 $hr->{upn_pk}) || die "Query insert_upv execute error. $DBI::errstr\n";
! 	}
      }
      elsif (exists($tree{update_node_pk}))

Index: edit_atree2.pl
===================================================================
RCS file: /cvsroot/genex/genex-server/site/webtools/Attic/edit_atree2.pl,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** edit_atree2.pl	13 Dec 2002 17:12:37 -0000	1.1.2.10
--- edit_atree2.pl	13 Dec 2002 21:51:59 -0000	1.1.2.11
***************
*** 11,18 ****
--- 11,20 ----
  {
      my $q = new CGI;
+     my %ch = $q->Vars();
      my $message;
      my $dbh = new_connection();
      my $us_fk = get_us_fk($dbh);
  
+ 
      my %tree = read_tree($q);
      write_db($dbh, \%tree);
***************
*** 20,27 ****
      my $url = index_url(); # see sessionlib.pl
      $url =~ s/(.*)\/.*/$1\/edit_atree1.pl/;
!     my $tree_pk = $q->param("tree_pk");
!     my $node_pk = $q->param("node_pk");
!     print "Location: $url?tree_pk=$tree_pk&node_pk=$node_pk\n\n";
! 
      $dbh->commit();
      $dbh->disconnect();
--- 22,33 ----
      my $url = index_url(); # see sessionlib.pl
      $url =~ s/(.*)\/.*/$1\/edit_atree1.pl/;
!     if (exists($ch{node_pk}))
!     {
! 	print "Location: $url?tree_pk=$ch{tree_pk}&node_pk=$ch{node_pk}\n\n";
!     }
!     else
!     {
! 	print "Location: $url?tree_pk=$ch{tree_pk}\n\n";
!     }
      $dbh->commit();
      $dbh->disconnect();
***************
*** 50,57 ****
      if (exists($ch{add}))
      {
- 	#
- 	# The single new node gets a special key "new", instead of a node_pk.
- 	# It'll get a node_pk later.
- 	#
  	$tree{add_an_fk} = $ch{select_node};
  	$tree{add_parent} = $active_node; 
--- 56,59 ----

Index: edit_atree1.html
===================================================================
RCS file: /cvsroot/genex/genex-server/site/webtools/Attic/edit_atree1.html,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** edit_atree1.html	13 Dec 2002 17:12:42 -0000	1.1.2.10
--- edit_atree1.html	13 Dec 2002 21:51:59 -0000	1.1.2.11
***************
*** 1,22 ****
  <html><head><title>Update Experimental Conditions</title></head>
  <body bgcolor="#FFFFFF">
!   <table width="600" border=0 cellpadding=0 cellspacing=0>
!     <tr><td align=top><img src="../graphics/genex_logo.jpg" align="left">GeneX Experimental Conditions Update<br><br>
!     <a href="./">Return to Genex Member Home</a><br><br clear=all><br>
      </td>
    </tr>
!   </table>
! Click the radio button of the node you wish to modify.<br>
! Node properties are not yet implemented.
! <br>
! <font color="#FF0000">{message}</font>
! <br>
! 
  <form action="edit_atree2.pl" method=POST>
! Analysis tree name: {tree_name}<br>
  <input type="text" name="tree_name" value="{tree_name}"> <input type="submit" name="Update" value="Update Name">
  <input type="hidden" name="tree_pk" value="{tree_pk}">
  <input type="hidden" name="root" value="{root}">
!   <table width="700" border="0" cellpadding="0" cellspacing="4">
      <tr>
      <td width="50%">
--- 1,24 ----
  <html><head><title>Update Experimental Conditions</title></head>
  <body bgcolor="#FFFFFF">
!   
! <table width="600" border=0 cellpadding=0 cellspacing=0>
!   <tr valign="top"> 
!     <td align=top width="50%"><img src="../graphics/genex_logo.jpg"><br>
!       GeneX Analysis Tree Update<br>
!       <a href="./">Return to Genex Member Home</a><br>
      </td>
+     <td align=top width="50%"><b>Instructions:</b> Click the radio button of the 
+       node you wish to modify, then click the pencil (edit), trash (delete) or use Add/Change
+       node at the bottom of the page. Scroll down for detailed instructions.<br>
+       <br>
+       <font color="#FF0000">{message}</font> </td>
    </tr>
! </table>
  <form action="edit_atree2.pl" method=POST>
!   Analysis tree name: {tree_name}
  <input type="text" name="tree_name" value="{tree_name}"> <input type="submit" name="Update" value="Update Name">
  <input type="hidden" name="tree_pk" value="{tree_pk}">
  <input type="hidden" name="root" value="{root}">
!   <table width="760" border="0" cellpadding="0" cellspacing="4">
      <tr>
      <td width="50%">
***************
*** 49,54 ****
  </form>
  <br>
! * (Node properties will eventually contain required fields.) Please complete these fields. This information is required before your analysis 
! will run.<br>
  </body>
  </html>
--- 51,73 ----
  </form>
  <br>
! <table width="600">
! <tr><td>
! * Please complete these fields. This information is required before your analysis 
! will run.
! <br>
! <br>
! <b>More instructions:</b>
! <br>
! Click the pencil to modify properties of a node.
! <br><br>
! To add a node, click the radio button of the parent node, then choose the 
! type of analysis from the drop down menu at the bottom of the page. Click Add Node.
! <br>
! <br>
! To delete a node, click the node's radio button, then click the trash can. There is no
! confirmation: we assume that since you clicked both the radio button and the trash can,
! you really meant it, and the node is immediately deleted as well as all the nodes children!
! <br>
! </td></tr></table>
  </body>
  </html>

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (267)	Nov (344)	Dec (119)
2003	Jan (23)	Feb (15)	Mar (16)	Apr (388)	May	Jun (4)	Jul	Aug	Sep (4)	Oct	Nov	Dec

genex-cvs-commit Mailing List for GeneX Gene Expression Database (Page 21)

genex-cvs-commit — CVS commit messages