[basedb-cvs] basedb/www/plotapplet plot_assay.phtml,1.2,1.3 plot_raw.phtml,1.1,1.2

[<tr...@us...>]

Update of /cvsroot/basedb/basedb/www/plotapplet
In directory sc8-pr-cvs1:/tmp/cvs-serv17061/www/plotapplet

Modified Files:
	plot_assay.phtml plot_raw.phtml 
Log Message:
began cleanup

Index: plot_assay.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/plotapplet/plot_assay.phtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** plot_assay.phtml	3 Feb 2003 20:13:20 -0000	1.2
--- plot_assay.phtml	18 Feb 2003 07:49:24 -0000	1.3
***************
*** 3,7 ****
  //
  // BioArray Software Environment (BASE) - homepage http://base.thep.lu.se/
! // Copyright (C) 2002 Mats Attnäs
  //
  // This file is part of BASE.
--- 3,7 ----
  //
  // BioArray Software Environment (BASE) - homepage http://base.thep.lu.se/
! // Copyright (C) 2002, 2003 Mats Attnäs, Carl Troein
  //
  // This file is part of BASE.
***************
*** 23,38 ****
  	require_once("../getconfig.inc.php");
  	require_once("init.inc.php");
- 	require_once("item_common.inc.php");
  	require_once("misc.inc.php");
! 	require_once("raw.inc.php");
! 	require_once("mime.inc.php");
  
  	verifyAccess(BioAssay::globalRead());
  ?>
  
! <applet code="plotapplet.PlotApplet" archive="plot.jar" width=1100 height=800>
! <param name="dataUrlBase" value="read_data.phtml?i_type=assay&i_id=<?= (int)$i_r ?>">
! <param name="cookies" value="<?= $config["cookieName"] . "=" . $_COOKIE[$config["cookieName"]] ?>">
! <param name="infoUrlBase" value="../spotinfo.phtml?i_r=<?= (int)$i_r ?>&i_pos=">
  <param name="infoIdColumn" value="position">
  <param name="addParameterName" value="i_add">
--- 23,46 ----
  	require_once("../getconfig.inc.php");
  	require_once("init.inc.php");
  	require_once("misc.inc.php");
! 	require_once("bioassay.inc.php");
! 	require_once("htmlinit.inc.php");
  
  	verifyAccess(BioAssay::globalRead());
+ 
+ 	$assid = isset($i_a) ? (int)$i_a : 0;
+ 
+ 	$pageTitle="$config[codename] - Java plot tool (BioAssay)";
+ 	htmlBegin($pageTitle);
  ?>
  
! <applet code="plotapplet.PlotApplet" archive="plot.jar" width=1100
! 	height=800>
! <param name="dataUrlBase"
! 	value="read_data.phtml?i_type=assay&i_id=<?= $assid ?>">
! <param name="cookies" value="<?=
! 	html($config["cookieName"] . "=" . $_COOKIE[$config["cookieName"]], 0)
! 	?>">
! <param name="infoUrlBase" value="../spotinfo.phtml?i_a=<?= $assid ?>&i_pos=">
  <param name="infoIdColumn" value="position">
  <param name="addParameterName" value="i_add">
***************
*** 42,44 ****
  
  </body>
! </html>
\ No newline at end of file
--- 50,53 ----
  
  </body>
! </html>
! 

Index: plot_raw.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/plotapplet/plot_raw.phtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** plot_raw.phtml	1 Feb 2003 18:19:12 -0000	1.1
--- plot_raw.phtml	18 Feb 2003 07:49:24 -0000	1.2
***************
*** 3,7 ****
  //
  // BioArray Software Environment (BASE) - homepage http://base.thep.lu.se/
! // Copyright (C) 2002 Mats Attnäs
  //
  // This file is part of BASE.
--- 3,7 ----
  //
  // BioArray Software Environment (BASE) - homepage http://base.thep.lu.se/
! // Copyright (C) 2002, 2003 Mats Attnäs, Carl Troein
  //
  // This file is part of BASE.
***************
*** 23,39 ****
  	require_once("../getconfig.inc.php");
  	require_once("init.inc.php");
- 	require_once("item_common.inc.php");
  	require_once("misc.inc.php");
  	require_once("raw.inc.php");
! 	require_once("mime.inc.php");
  
  	verifyAccess(RawBioAssay::globalRead());
- ?>
  
! <applet code="plotapplet.PlotApplet" archive="plot.jar" width=1100 height=800>
! <param name="dataUrlBase" value="read_data.phtml?i_type=raw&i_id=<?= (int)$i_r ?>">
! <param name="cookies" value="<?= $config["cookieName"] . "=" . $_COOKIE[$config["cookieName"]] ?>">
! <param name="infoUrlBase" value="../spotinfo.phtml?i_r=<?= (int)$i_r ?>&i_pos=">
! <param name="infoIdColumn" value="position">
  <param name="addParameterName" value="i_add">
  
--- 23,46 ----
  	require_once("../getconfig.inc.php");
  	require_once("init.inc.php");
  	require_once("misc.inc.php");
  	require_once("raw.inc.php");
! 	require_once("htmlinit.inc.php");
  
  	verifyAccess(RawBioAssay::globalRead());
  
! 	$rawid = isset($i_r) ? (int)$i_r : 0;
! 
! 	$pageTitle="$config[codename] - Java plot tool (raw data)";
! 	htmlBegin($pageTitle);
! ?>
! <applet code="plotapplet.PlotApplet" archive="plot.jar" width=1100
! 	height=800>
! <param name="dataUrlBase"
! 	value="read_data.phtml?i_type=raw&i_id=<?= $rawid ?>">
! <param name="cookies" value="<?=
! 	html($config["cookieName"] . "=" . $_COOKIE[$config["cookieName"]], 0)
! 	?>">
! <param name="infoUrlBase" value="../spotinfo.phtml?i_r=<?= $rawid ?>&i_pos=">
! <param name="infoIdColumn" value="rawPosition">
  <param name="addParameterName" value="i_add">
  
***************
*** 42,44 ****
  
  </body>
! </html>
\ No newline at end of file
--- 49,52 ----
  
  </body>
! </html>
!