Menu
▾
▴
basedb-cvs — CVS commit messages
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(14) |
Sep
(76) |
Oct
(65) |
Nov
(177) |
Dec
(147) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(257) |
Feb
(313) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tr...@us...> - 2003-02-15 11:29:10
|
Update of /cvsroot/basedb/basedb/include/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv20384/include/classes
Modified Files:
item.inc.php news.inc.php raw.inc.php reporterlist.inc.php
user.inc.php
Log Message:
Fixed problems that were found while running as non-superuser
Index: item.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/item.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** item.inc.php 2 Feb 2003 15:31:51 -0000 1.21
--- item.inc.php 15 Feb 2003 11:29:06 -0000 1.22
***************
*** 303,311 ****
}
! // Returns an array with (name,removed,owner), plus
// gid,groupAccess,worldAccess if $sharing is true.
function getBasicFromId($type, $id, $sharing = true)
{
! $query = "SELECT name, removed, owner".
($sharing ? ", gid, `groupAccess`, `worldAccess`" : "").
" FROM $type WHERE id = ".(int)$id;
--- 303,311 ----
}
! // Returns an array with (id,name,removed,owner), plus
// gid,groupAccess,worldAccess if $sharing is true.
function getBasicFromId($type, $id, $sharing = true)
{
! $query = "SELECT id, name, removed, owner".
($sharing ? ", gid, `groupAccess`, `worldAccess`" : "").
" FROM $type WHERE id = ".(int)$id;
Index: news.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/news.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** news.inc.php 30 Dec 2002 22:09:16 -0000 1.6
--- news.inc.php 15 Feb 2003 11:29:07 -0000 1.7
***************
*** 74,78 ****
$query = "SELECT COUNT(*) FROM News n ".
! "WHERE ".db_true()." ".$search->getWhere();
$res = query($query);
if($row =& db_fetch_row($res)) $cnt = $row[0];
--- 74,79 ----
$query = "SELECT COUNT(*) FROM News n ".
! "WHERE ".Item::whereRemoved("n", 0)." ".
! $search->getWhere();
$res = query($query);
if($row =& db_fetch_row($res)) $cnt = $row[0];
***************
*** 92,96 ****
$query = "SELECT n.*, ug.`name` AS `userName` ".
"FROM News n, UserGroup ug ".
! "WHERE n.owner = ug.id";
$search->getWhere()." $ob ".$search->makeLimit();
--- 93,98 ----
$query = "SELECT n.*, ug.`name` AS `userName` ".
"FROM News n, UserGroup ug ".
! "WHERE n.owner = ug.id ".
! Item::whereRemovedAnd("n", 0)." ".
$search->getWhere()." $ob ".$search->makeLimit();
Index: raw.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/raw.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** raw.inc.php 3 Feb 2003 20:13:18 -0000 1.27
--- raw.inc.php 15 Feb 2003 11:29:07 -0000 1.28
***************
*** 346,349 ****
--- 346,350 ----
$search->makeWhere($fields);
$search->addExtraWhere(Item::whereRemoved("r", $removed));
+ $search->addExtraWhere(Item::whereShared("r", $user));
if($expid)
{
Index: reporterlist.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/reporterlist.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** reporterlist.inc.php 30 Jan 2003 16:45:21 -0000 1.11
--- reporterlist.inc.php 15 Feb 2003 11:29:07 -0000 1.12
***************
*** 389,393 ****
}
!
}
--- 389,396 ----
}
! function isShared($user, $write = 0)
! {
! return Experiment::isSharedId($this->experiment, $user, $write);
! }
}
Index: user.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/user.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** user.inc.php 4 Feb 2003 18:28:59 -0000 1.24
--- user.inc.php 15 Feb 2003 11:29:07 -0000 1.25
***************
*** 248,252 ****
}
! // Superusers can edit anyone, but cannot be edited by normal user admins.
function mayEdit(&$user)
{
--- 248,252 ----
}
! /* // Superusers can edit anyone, but cannot be edited by normal user admins.
function mayEdit(&$user)
{
***************
*** 262,265 ****
--- 262,278 ----
{
return $this->mayEdit($user);
+ }*/
+
+ // Superusers can edit anyone, but cannot be edited by normal user admins.
+ function isShared($user, $write = 0)
+ {
+ $acc = (int)$write;
+ if(!$acc)
+ {
+ return $user->access($this->globalRead());
+ }
+ return $user->access(BUA_SUPERUSER) ||
+ $user->access($this->globalEdit()) &&
+ !$this->access(BUA_SUPERUSER);
}
}
|
|
From: <tr...@us...> - 2003-02-15 11:29:10
|
Update of /cvsroot/basedb/basedb/include/common
In directory sc8-pr-cvs1:/tmp/cvs-serv20384/include/common
Modified Files:
misc.inc.php
Log Message:
Fixed problems that were found while running as non-superuser
Index: misc.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/common/misc.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** misc.inc.php 28 Jan 2003 14:19:15 -0000 1.17
--- misc.inc.php 15 Feb 2003 11:29:07 -0000 1.18
***************
*** 264,269 ****
{
$r = 0x0;
! $b = 0x10;
! $g = 0x98;
$ra = -$ra;
}
--- 264,269 ----
{
$r = 0x0;
! $b = 0x00;
! $g = 0xb8;
$ra = -$ra;
}
|
|
From: <tr...@us...> - 2003-02-15 11:28:29
|
Update of /cvsroot/basedb/basedb/www
In directory sc8-pr-cvs1:/tmp/cvs-serv20227/www
Modified Files:
news_edit.phtml
Log Message:
Changed to new structure
Index: news_edit.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/news_edit.phtml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** news_edit.phtml 2 Feb 2003 15:31:52 -0000 1.17
--- news_edit.phtml 15 Feb 2003 11:28:27 -0000 1.18
***************
*** 30,75 ****
setLocation("news_list.phtml");
! $edit = true;
$err = "";
! if(isset($i_ok))
{
! $news = new News();
! if($i_n > 0)
! {
! if(!$news->read($i_n)) $err = "No such news item";
[...86 lines suppressed...]
! }
! $edit = false;
}
}
if($edit) $what = $newsid ? "Edit" : "New";
***************
*** 84,88 ****
?>">Return</a></td></tr>
<?
! if($err) echo "<tr><td colspan=2 class=red>Error: $err</td></tr>\n";
if($edit)
--- 93,98 ----
?>">Return</a></td></tr>
<?
! if($err)
! echo "<tr><td colspan=2 class=red>Error: $err</td></tr>\n";
if($edit)
|
|
From: <tr...@us...> - 2003-02-15 11:27:56
|
Update of /cvsroot/basedb/basedb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv20056/src
Modified Files:
ftpdspawner.cc
Log Message:
changed includes
Index: ftpdspawner.cc
===================================================================
RCS file: /cvsroot/basedb/basedb/src/ftpdspawner.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ftpdspawner.cc 1 Feb 2003 12:52:53 -0000 1.1
--- ftpdspawner.cc 15 Feb 2003 11:27:52 -0000 1.2
***************
*** 24,28 ****
#include <stdlib.h>
#include <sys/socket.h>
- #include <sys/signal.h>
#include <sys/wait.h>
#include <errno.h>
--- 24,27 ----
***************
*** 31,34 ****
--- 30,34 ----
#include <unistd.h>
#include <stdarg.h>
+ #include <signal.h>
void cleanup(int errcode,char *errmsg,...)
***************
*** 66,70 ****
}
! int moomoo(char **command, int fd, struct sockaddr_in *sa)
{
char *a = inet_ntoa(sa->sin_addr);
--- 66,70 ----
}
! int runprogram(char **command, int fd, struct sockaddr_in *sa)
{
char *a = inet_ntoa(sa->sin_addr);
***************
*** 111,115 ****
if(sock < 0)
cleanup(10, "accept failed: %s\n", strerror(errno));
! moomoo(&argv[2], sock, &saddr);
close(sock);
}
--- 111,115 ----
if(sock < 0)
cleanup(10, "accept failed: %s\n", strerror(errno));
! runprogram(&argv[2], sock, &saddr);
close(sock);
}
|
|
From: <tr...@us...> - 2003-02-13 22:30:13
|
Update of /cvsroot/basedb/basedb/include/web
In directory sc8-pr-cvs1:/tmp/cvs-serv4457/include/web
Modified Files:
hyb_common.inc.php probe_common.inc.php
Log Message:
Fixes soon after 1.2.0RC2...
Index: hyb_common.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/hyb_common.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** hyb_common.inc.php 13 Feb 2003 11:36:52 -0000 1.11
--- hyb_common.inc.php 13 Feb 2003 22:29:36 -0000 1.12
***************
*** 136,140 ****
return "Unable to use image for JPEG: image not found";
$ch = $img->getChannels();
! if($ch != -1 && $ch != 1 && $ch != 2)
return "Unable to use image for JPEG: can't handle its channel(s)";
else if(!$img->takeOverUseForJpeg())
--- 136,140 ----
return "Unable to use image for JPEG: image not found";
$ch = $img->getChannels();
! if($ch != 1 && $ch != 2 && $ch != IMAGE_CHANNEL_BOTH)
return "Unable to use image for JPEG: can't handle its channel(s)";
else if(!$img->takeOverUseForJpeg())
***************
*** 213,218 ****
"',".($un ? 1 : 0).")\">".
($un ? "Undelete" : "Delete")."</a>]";
!
! if($a["channels"] > 0)
{
$func[] = "[<a href='javascript:useForJpeg($a[id])'>".
--- 213,218 ----
"',".($un ? 1 : 0).")\">".
($un ? "Undelete" : "Delete")."</a>]";
!
! if($ch == 1 || $ch == 2 || $ch == IMAGE_CHANNEL_BOTH)
{
$func[] = "[<a href='javascript:useForJpeg($a[id])'>".
Index: probe_common.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/probe_common.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** probe_common.inc.php 30 Dec 2002 22:09:17 -0000 1.2
--- probe_common.inc.php 13 Feb 2003 22:29:36 -0000 1.3
***************
*** 36,41 ****
$bgcolor ^= 1;
$w =& $wells[$wellid];
! if($wellid == $curWell) echo "<tr class=pink>";
! else echo "<tr bgcolor=$tdbg[$bgcolor]>";
$plink = html($w["name"]);
--- 36,43 ----
$bgcolor ^= 1;
$w =& $wells[$wellid];
! if($wellid == $curWell)
! echo "<tr class=pink>";
! else
! echo "<tr bgcolor=$tdbg[$bgcolor]>";
$plink = html($w["name"]);
***************
*** 50,54 ****
"<td>".html($w["bacterialGrowth"])."</td>".
"<td>".html($w["comment"])."</td></tr>\n";
! if(!isset($children[$wellid])) return;
$c =& $children[$wellid];
for($i = 0; $i < count($c); $i++)
--- 52,57 ----
"<td>".html($w["bacterialGrowth"])."</td>".
"<td>".html($w["comment"])."</td></tr>\n";
! if(!isset($children[$wellid]))
! return;
$c =& $children[$wellid];
for($i = 0; $i < count($c); $i++)
|
|
From: <tr...@us...> - 2003-02-13 22:30:13
|
Update of /cvsroot/basedb/basedb/include/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv4457/include/classes
Modified Files:
acquisition.inc.php image.inc.php spotimage.inc.php
Log Message:
Fixes soon after 1.2.0RC2...
Index: acquisition.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/acquisition.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** acquisition.inc.php 13 Feb 2003 11:36:52 -0000 1.14
--- acquisition.inc.php 13 Feb 2003 22:29:35 -0000 1.15
***************
*** 178,183 ****
}
! // Returns true if this acquisition has what it takes for a spot JPEG
! // to be created.
function canCreateJpegImage()
{
--- 178,184 ----
}
! // Returns non-0 if this acquisition has what it takes for a spot JPEG
! // to be created. 1 means that there are two tiffs, 2 that there is one
! // with both channels
function canCreateJpegImage()
{
***************
*** 192,198 ****
$arr[] = $row[0];
if(count($arr) == 1 && $arr[0] == IMAGE_CHANNEL_BOTH)
! return true;
if(count($arr) == 2 && $arr[0] == 1 && $arr[1] == 2)
! return true;
return false;
}
--- 193,199 ----
$arr[] = $row[0];
if(count($arr) == 1 && $arr[0] == IMAGE_CHANNEL_BOTH)
! return 2;
if(count($arr) == 2 && $arr[0] == 1 && $arr[1] == 2)
! return 1;
return false;
}
Index: image.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/image.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** image.inc.php 13 Feb 2003 11:36:52 -0000 1.15
--- image.inc.php 13 Feb 2003 22:29:35 -0000 1.16
***************
*** 200,207 ****
function takeOverUseForJpeg()
{
! if($this->channels == -3)
$andchan = "";
else if($this->channels == 1 || $this->channels == 2)
! $andchan = "AND channels = $this->channels";
else
return false;
--- 200,207 ----
function takeOverUseForJpeg()
{
! if($this->channels == IMAGE_CHANNEL_BOTH)
$andchan = "";
else if($this->channels == 1 || $this->channels == 2)
! $andchan = "AND channels <> ".(3 - $this->channels);
else
return false;
Index: spotimage.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/spotimage.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** spotimage.inc.php 13 Feb 2003 11:36:52 -0000 1.10
--- spotimage.inc.php 13 Feb 2003 22:29:35 -0000 1.11
***************
*** 24,27 ****
--- 24,28 ----
require_once("raw.inc.php");
require_once("image.inc.php");
+ require_once("plate.inc.php");
***************
*** 99,103 ****
// $imgs is an array with either two images (keys 1 and 2) or one image
// (key IMAGE_CHANNEL_BOTH).
[...65 lines suppressed...]
global $BC;
--- 179,183 ----
// Returns an error message
! function createSpotImages($skiptiffs = 0)
{
global $BC;
***************
*** 203,207 ****
$err = "Spot image directory error";
else
! $err = $this->runSpotImageChopper($dir, $imgs);
if($err != "")
--- 207,211 ----
$err = "Spot image directory error";
else
! $err = $this->runSpotImageChopper($dir, $imgs, $skiptiffs);
if($err != "")
|
Update of /cvsroot/basedb/basedb/www
In directory sc8-pr-cvs1:/tmp/cvs-serv4457/www
Modified Files:
gene_explore.phtml hyb_edit.phtml hyb_result.phtml
raw_makeimages.phtml raw_table.phtml test.phtml
Log Message:
Fixes soon after 1.2.0RC2...
Index: gene_explore.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/gene_explore.phtml,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** gene_explore.phtml 11 Feb 2003 14:43:57 -0000 1.72
--- gene_explore.phtml 13 Feb 2003 22:29:37 -0000 1.73
***************
*** 151,154 ****
--- 151,159 ----
?>&oldlocation=<?= urlencode($location) ?>&i_filt="+filt;
}
+ function exploreGene()
+ {
+ document.ff.i_gsearch.value=0;
+ document.ff.submit();
+ }
</script>
<?
Index: hyb_edit.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/hyb_edit.phtml,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** hyb_edit.phtml 13 Feb 2003 08:47:47 -0000 1.53
--- hyb_edit.phtml 13 Feb 2003 22:29:37 -0000 1.54
***************
*** 189,193 ****
// New labeled extracts to associate?
! for($ch = 1; $ch < $maxch && $err == ""; $ch++)
{
if(!isset($i_lext[$ch]))
--- 189,193 ----
// New labeled extracts to associate?
! for($ch = 1; $ch <= $maxch && $err == ""; $ch++)
{
if(!isset($i_lext[$ch]))
Index: hyb_result.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/hyb_result.phtml,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** hyb_result.phtml 2 Feb 2003 15:31:52 -0000 1.73
--- hyb_result.phtml 13 Feb 2003 22:29:38 -0000 1.74
***************
*** 411,414 ****
--- 411,415 ----
}
$rep = new Reporter();
+ $arr[$rawcolcnt] = $rid; // For the prefix
$rep->setAllFromArray($arr, $rawcolcnt);
if(!$rep->write())
***************
*** 446,449 ****
--- 447,458 ----
$atid = 0;
$atmaptype = 0;
+
+ if(!$noarray)
+ {
+ $arr = ArraySlide::getBriefForHyb($hyb->getId(), $curUser);
+ if(!$arr)
+ $noarray = true;
+ }
+
if(!$noarray)
{
Index: raw_makeimages.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/raw_makeimages.phtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** raw_makeimages.phtml 13 Feb 2003 11:36:53 -0000 1.3
--- raw_makeimages.phtml 13 Feb 2003 22:29:38 -0000 1.4
***************
*** 73,82 ****
$spi = new SpotImage($raw);
// States: need to clear, need to choose images, set parameters, done
$state = 2;
if($raw->getHasSpotImages() == 1)
$state = 0;
! else if(!$acq->canCreateJpegImage())
$state = 1;
--- 73,85 ----
$spi = new SpotImage($raw);
+ $skiptiffs = isset($i_skiptiffs) ? (int)$i_skiptiffs : 0;
+
// States: need to clear, need to choose images, set parameters, done
$state = 2;
+ $tifftype = 0;
if($raw->getHasSpotImages() == 1)
$state = 0;
! else if(!($tifftype = $acq->canCreateJpegImage()))
$state = 1;
***************
*** 85,89 ****
if(!$spi->removeSpotImages())
$err = "Unable to remove existing spot images";
! else if(!$acq->canCreateJpegImage())
$state = 1;
else
--- 88,92 ----
if(!$spi->removeSpotImages())
$err = "Unable to remove existing spot images";
! else if(!($tifftype = $acq->canCreateJpegImage()))
$state = 1;
else
***************
*** 123,126 ****
--- 126,134 ----
$header = $raw->getFileHeader();
$spi->updateSpotInfoFromHeader($header, false);
+ if($tifftype == 2)
+ {
+ if(strpos($header, "Scanner=GenePix 4000A") !== false)
+ $skiptiffs = 2;
+ }
}
}
***************
*** 195,199 ****
ob_implicit_flush(1);
echo "<br><pre>\n";
! $err = $spi->createSpotImages();
ob_implicit_flush(0);
echo "</pre><p><table $cellpad>\n";
--- 203,207 ----
ob_implicit_flush(1);
echo "<br><pre>\n";
! $err = $spi->createSpotImages($skiptiffs);
ob_implicit_flush(0);
echo "</pre><p><table $cellpad>\n";
***************
*** 224,227 ****
--- 232,246 ----
<td><input type=text size=8 name=i_imgoffy value="<?=
$raw->getSpotImageOffsetY() ?>"> units</td></tr>
+ <?
+ if($tifftype == 2)
+ {
+ ?>
+ <tr><th>Skip preview TIFFs</th>
+ <td><input type=text size=8 name=i_skiptiffs value="<?=
+ $skiptiffs ?>"> first parts of multi-image TIFF will be
+ skipped</td></tr>
+ <?
+ }
+ ?>
<tr><td colspan=2><input type=submit name=i_useheader
value="Get data from header">
Index: raw_table.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/raw_table.phtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** raw_table.phtml 3 Feb 2003 08:55:47 -0000 1.3
--- raw_table.phtml 13 Feb 2003 22:29:38 -0000 1.4
***************
*** 183,187 ****
{
$cols[] = array("spots", false, array("Sp", $spots),
! 0, "renderSpot", 0, "w" => 1);
}
--- 183,187 ----
{
$cols[] = array("spots", false, array("Sp", $spots),
! 0, "renderSpots", 0, "w" => 1);
}
***************
*** 207,214 ****
function renderSpots(&$row)
{
! global $cbRaw;
$pos = $row["rawPosition"];
! $s *= 1;
echo "<td><img width=$s height=$s ".
"src='raw_spot.phtml/spot_${cbRaw}_${pos}_$s.png'></td>\n";
--- 207,214 ----
function renderSpots(&$row)
{
! global $cbRaw, $raw;
$pos = $row["rawPosition"];
! $s = $raw->getSpotImagePixels() * 1;
echo "<td><img width=$s height=$s ".
"src='raw_spot.phtml/spot_${cbRaw}_${pos}_$s.png'></td>\n";
Index: test.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/test.phtml,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** test.phtml 13 Feb 2003 11:36:53 -0000 1.61
--- test.phtml 13 Feb 2003 22:29:38 -0000 1.62
***************
*** 25,28 ****
--- 25,30 ----
//require_once("init.inc.php");
+ echo ("-1" == -1)."\n\n";
+
$arr = array(-1 => "a", 0 => "b", 1 => "c");
$arr["-1"] = "e";
|
|
From: <tr...@us...> - 2003-02-13 22:22:06
|
Update of /cvsroot/basedb/basedb In directory sc8-pr-cvs1:/tmp/cvs-serv501 Modified Files: README Log Message: updated LOCAL INFILE info (thanks, Philippe) Index: README =================================================================== RCS file: /cvsroot/basedb/basedb/README,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** README 13 Feb 2003 12:26:44 -0000 1.23 --- README 13 Feb 2003 22:22:02 -0000 1.24 *************** *** 44,51 **** better performance. Be sure to enable the query cache, and maybe set query_cache_limit to a lower value than the default (10k should be enough). ! When you install MySQL, make sure that LOAD LOCAL DATA INFILE works. The ! binary distributions from mysql.com have this, but the packages included ! with some Linux distributions don't. If you compile MySQL yourself, you can ! configure with --enable-local-infile. As of BASE 1.2, PHP 4.3 is the ONLY supported version of PHP. Versions --- 44,58 ---- better performance. Be sure to enable the query cache, and maybe set query_cache_limit to a lower value than the default (10k should be enough). ! ! For better performance in some situations (result file upload, running ! plugins, etc.), BASE can use LOAD LOCAL DATA INFILE as an alternative to ! just doing plain INSERTS. If you want to use LOAD LOCAL DATA INFILE, you ! should configure MySQL with --enable-local-infile. The binary distributions ! from mysql.com have this, but the packages included with some Linux ! distributions don't. Also, PHP will need to be built against the MySQL ! libraries that come with MySQL, rather than against the ones that come with ! PHP. That is, PHP needs --with-mysql=... rather than just --with-mysql . ! Finally, for LOAD LOCAL to be used, there is an option in the configuration ! file for BASE (see further down in this README). As of BASE 1.2, PHP 4.3 is the ONLY supported version of PHP. Versions |
|
From: <tr...@us...> - 2003-02-13 12:34:42
|
Update of /cvsroot/basedb/basedb/include/web
In directory sc8-pr-cvs1:/tmp/cvs-serv29737/include/web
Modified Files:
newinit.inc.php
Log Message:
added check for config
Index: newinit.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/newinit.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** newinit.inc.php 30 Dec 2002 22:09:17 -0000 1.4
--- newinit.inc.php 13 Feb 2003 12:34:39 -0000 1.5
***************
*** 21,24 ****
--- 21,28 ----
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
+
+ if(!isset($config))
+ die("Fatal error: newinit.inc.php included without config.inc.php!\n");
+
require_once("db.inc.php");
require_once("user.inc.php");
|
|
From: <tr...@us...> - 2003-02-13 12:31:41
|
Update of /cvsroot/basedb/basedb/sql In directory sc8-pr-cvs1:/tmp/cvs-serv28572/sql Modified Files: Makefile.am Log Message: added missing file Index: Makefile.am =================================================================== RCS file: /cvsroot/basedb/basedb/sql/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 12 Feb 2003 17:00:48 -0000 1.1 --- Makefile.am 13 Feb 2003 12:31:36 -0000 1.2 *************** *** 5,7 **** sqldir = $(prefix)/sql ! dist_sql_DATA = base_mysql.sql base_mysql_data.sql base_pgsql.sql --- 5,8 ---- sqldir = $(prefix)/sql ! dist_sql_DATA = base_mysql.sql base_mysql_data.sql base_pgsql.sql \ ! upgrade_rc1_to_rc2.sql |
|
From: <tr...@us...> - 2003-02-13 12:26:48
|
Update of /cvsroot/basedb/basedb In directory sc8-pr-cvs1:/tmp/cvs-serv26788 Modified Files: README Log Message: Added nore about ./configure not detecting libs Index: README =================================================================== RCS file: /cvsroot/basedb/basedb/README,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** README 13 Feb 2003 12:22:47 -0000 1.22 --- README 13 Feb 2003 12:26:44 -0000 1.23 *************** *** 97,101 **** where the prefix is wherever you wish BASE to be installed. The default prefix is /usr/local/base. Note that BASE will install a number of files ! and directories in the prefix dir, so make sure it's a BASE-only directory. Next, compile the things that need to be compiled: --- 97,103 ---- where the prefix is wherever you wish BASE to be installed. The default prefix is /usr/local/base. Note that BASE will install a number of files ! and directories in the prefix dir, so make sure you put e.g. /foo/bar/base ! instead of /foo/bar, unless you really want lots of files in /foo/bar ! If configure tells you that you don't have gsl or somesuch, just ignore it. Next, compile the things that need to be compiled: |
|
From: <tr...@us...> - 2003-02-13 12:24:00
|
Update of /cvsroot/basedb/basedb/sql
In directory sc8-pr-cvs1:/tmp/cvs-serv25703/sql
Modified Files:
base_mysql_data.sql base_pgsql.sql
Log Message:
Bumped schema version
Index: base_mysql_data.sql
===================================================================
RCS file: /cvsroot/basedb/basedb/sql/base_mysql_data.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** base_mysql_data.sql 2 Feb 2003 18:17:08 -0000 1.2
--- base_mysql_data.sql 13 Feb 2003 12:23:56 -0000 1.3
***************
*** 53,57 ****
INSERT INTO SampleTissue (id, parent, name, descr, owner, addedDate, removed) VALUES (1,'','Homo sapiens','',1,'0000-00-00','');
! INSERT INTO SchemaVersion VALUES ('1.2.0RC1','1.2.2', '2002-12-23 15:53:17');
INSERT INTO UserGroup (id, name, descr, owner, addedDate, removed, accessMask,isAccount) VALUES
--- 53,57 ----
INSERT INTO SampleTissue (id, parent, name, descr, owner, addedDate, removed) VALUES (1,'','Homo sapiens','',1,'0000-00-00','');
! INSERT INTO SchemaVersion VALUES ('1.2.0RC2','1.2.3', '2002-02-13 12:44:00');
INSERT INTO UserGroup (id, name, descr, owner, addedDate, removed, accessMask,isAccount) VALUES
Index: base_pgsql.sql
===================================================================
RCS file: /cvsroot/basedb/basedb/sql/base_pgsql.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** base_pgsql.sql 2 Feb 2003 18:17:29 -0000 1.2
--- base_pgsql.sql 13 Feb 2003 12:23:56 -0000 1.3
***************
*** 234,239 ****
"bioAssaySet" int NOT NULL default '0',
"extraDataColumn" int NOT NULL default '0',
! "position" smallint NOT NULL default '0'
! , CONSTRAINT BioAssaySetExtraColumn_pkey PRIMARY KEY ("bioAssaySet","extraDataColumn")
);
--- 234,239 ----
"bioAssaySet" int NOT NULL default '0',
"extraDataColumn" int NOT NULL default '0',
! "position" smallint NOT NULL
! , CONSTRAINT BioAssaySetExtraColumn_pkey PRIMARY KEY ("bioAssaySet","position")
);
***************
*** 1324,1328 ****
CREATE INDEX BioAssaySet_experiment_index ON BioAssaySet USING btree ("experiment");
! CREATE UNIQUE INDEX BioAssaySetExtraColumn_setpos_index ON BioAssaySetExtraColumn USING btree ("bioAssaySet","position");
CREATE UNIQUE INDEX BioAssaySetSearch_ref_index ON BioAssaySetSearch USING btree ("bioAssaySet","userGroup","searchType");
--- 1324,1328 ----
CREATE INDEX BioAssaySet_experiment_index ON BioAssaySet USING btree ("experiment");
! CREATE UNIQUE INDEX BioAssaySetExtraColumn_setcol_index ON BioAssaySetExtraColumn USING btree ("bioAssaySet","extraDataColumn");
CREATE UNIQUE INDEX BioAssaySetSearch_ref_index ON BioAssaySetSearch USING btree ("bioAssaySet","userGroup","searchType");
|
|
From: <tr...@us...> - 2003-02-13 12:23:59
|
Update of /cvsroot/basedb/basedb/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv25703/bin
Modified Files:
dbmigrate_107_to_12.php startBase.php
Log Message:
Bumped schema version
Index: dbmigrate_107_to_12.php
===================================================================
RCS file: /cvsroot/basedb/basedb/bin/dbmigrate_107_to_12.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dbmigrate_107_to_12.php 3 Feb 2003 17:39:29 -0000 1.3
--- dbmigrate_107_to_12.php 13 Feb 2003 12:23:56 -0000 1.4
***************
*** 157,161 ****
// This is the first insert into to the new database, because we
// use the SchemaVersion table to test if the database is empty.
! $query = "INSERT INTO SchemaVersion VALUES ('1.2.0RC1', '1.2.2', NOW())";
myquery($query, 1);
--- 157,161 ----
// This is the first insert into to the new database, because we
// use the SchemaVersion table to test if the database is empty.
! $query = "INSERT INTO SchemaVersion VALUES ('1.2.0RC2', '1.2.3', NOW())";
myquery($query, 1);
Index: startBase.php
===================================================================
RCS file: /cvsroot/basedb/basedb/bin/startBase.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** startBase.php 10 Feb 2003 08:40:40 -0000 1.3
--- startBase.php 13 Feb 2003 12:23:56 -0000 1.4
***************
*** 129,136 ****
global $BC;
$sv = $BC->schemaVersion();
! if($sv != "1.2.2")
{
fwrite(STDERR, "Error: The database schema version is $sv,\n".
! "but this version of BASE requires schema version 1.2.2\n");
return 0;
}
--- 129,137 ----
global $BC;
$sv = $BC->schemaVersion();
! if($sv != "1.2.3")
{
fwrite(STDERR, "Error: The database schema version is $sv,\n".
! "but this version of BASE requires schema version 1.2.3\n".
! "Use the migration scripts in bin to correct this.\n");
return 0;
}
|
|
From: <tr...@us...> - 2003-02-13 12:22:51
|
Update of /cvsroot/basedb/basedb
In directory sc8-pr-cvs1:/tmp/cvs-serv25237
Modified Files:
README
Log Message:
Updated ftpd stuff, migration stuff
Index: README
===================================================================
RCS file: /cvsroot/basedb/basedb/README,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** README 12 Feb 2003 17:57:02 -0000 1.21
--- README 13 Feb 2003 12:22:47 -0000 1.22
***************
*** 265,283 ****
Included with BASE is an FTP server which can be used to upload/download
! file to/from BASE. In the future it'll also handle downloads of other types.
! If you want to use it, here's how: When you compiled the things in
! exec/source, two programs called spawner and baseftpd were created and
! copied to exec/baseftpd. baseftpd needs to be started by inetd, but in the
! case that you don't have access to inetd.conf (my situation on the BASE
! development box), spawner can be used instead, e.g.
! nohup ./spawner 2121 ./baseftpd &
! to listen for connections on port 2121. Using inetd (the normal solution),
[...72 lines suppressed...]
*** 310,313 ****
This will - if all goes well - copy data from the old databases to the
new, and at the same time modify the data directory as needed.
! Start BASE using the script exec/restart.php
--- 315,328 ----
This will - if all goes well - copy data from the old databases to the
new, and at the same time modify the data directory as needed.
! Start BASE using the script bin/startBase.php as described above.
!
! If you have BASE 1.2.0RC1 installed, upgrading to RC2 will be relatively
! painless. You can use the old data directory without any changes, but the
! rest of the old installation needs to be replaced. There have been a few
! changes to the things required in config.inc.php, so you should copy the
! new example_config.inc.php and modify with things from your old config.
! Finally, there have been three changes to the database schema. Two of
! these can be considered bug fixes, and the third was just something I'd
! forgotten to add. The file sql/upgrade_rc1_to_rc2.sql contains the SQL
! statements that need to be run to get the schema up to date.
|
|
From: <tr...@us...> - 2003-02-13 12:06:52
|
Update of /cvsroot/basedb/basedb/sql In directory sc8-pr-cvs1:/tmp/cvs-serv17804/sql Added Files: upgrade_rc1_to_rc2.sql Log Message: Untested --- NEW FILE: upgrade_rc1_to_rc2.sql --- DROP TABLE BioAssaySetExtraColumn; CREATE TABLE BioAssaySetExtraColumn ( bioAssaySet int(11) NOT NULL default '0', extraDataColumn int(11) NOT NULL default '0', position tinyint(4) NOT NULL auto_increment, PRIMARY KEY (bioAssaySet,position), UNIQUE KEY setcol (bioAssaySet,extraDataColumn) ) TYPE=MyISAM; ALTER TABLE UserAccount ADD defaultGid int(11) NOT NULL default '0', ADD defaultGroupAccess tinyint(1) NOT NULL default '0', ADD defaultWorldAccess tinyint(1) NOT NULL default '0'; ALTER TABLE UserGroup CHANGE name name varchar(30) default NULL; UPDATE SchemaVersion SET baseVersion = '1.2.0RC2', schemaVersion = '1.2.3', lastChanged = NOW(); |
|
From: <tr...@us...> - 2003-02-13 11:36:56
|
Update of /cvsroot/basedb/basedb/www In directory sc8-pr-cvs1:/tmp/cvs-serv1522/www Modified Files: raw_makeimages.phtml test.phtml Log Message: Updated image channel handling Index: raw_makeimages.phtml =================================================================== RCS file: /cvsroot/basedb/basedb/www/raw_makeimages.phtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** raw_makeimages.phtml 13 Dec 2002 07:24:29 -0000 1.2 --- raw_makeimages.phtml 13 Feb 2003 11:36:53 -0000 1.3 *************** *** 3,7 **** // // BioArray Software Environment (BASE) - homepage http://base.thep.lu.se/ ! // Copyright (C) 2002 Lao Saal, Carl Troein, Johan Vallon-Christersson // // This file is part of BASE. --- 3,7 ---- // // BioArray Software Environment (BASE) - homepage http://base.thep.lu.se/ ! // Copyright (C) 2002,2003 Lao Saal, Carl Troein, Johan Vallon-Christersson // // This file is part of BASE. *************** *** 182,187 **** <tr><td colspan=2>The 'use for JPEG' flag needs to be set for one TIFF image from channel 1 and one from channel 2, or one two-channel TIFF. ! <input type=submit name=i_autoimg ! value="Attempt automatic recognition"></td></tr> <? } --- 182,187 ---- <tr><td colspan=2>The 'use for JPEG' flag needs to be set for one TIFF image from channel 1 and one from channel 2, or one two-channel TIFF. ! <br><input type=submit name=i_autoimg ! value="Attempt to auto-select image(s)"></td></tr> <? } *************** *** 234,238 **** echo "</table><p>\n"; showDelPrep(); ! imageList($acq, $curUser, true); echo "</form>\n"; --- 234,238 ---- echo "</table><p>\n"; showDelPrep(); ! imageList($acq, $curUser, true, "in image set"); echo "</form>\n"; Index: test.phtml =================================================================== RCS file: /cvsroot/basedb/basedb/www/test.phtml,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** test.phtml 30 Dec 2002 22:09:18 -0000 1.60 --- test.phtml 13 Feb 2003 11:36:53 -0000 1.61 *************** *** 23,30 **** header("content-type: text/plain"); ! require_once("init.inc.php"); ! print_r($_SERVER); exit; --- 23,36 ---- header("content-type: text/plain"); ! //require_once("init.inc.php"); ! $arr = array(-1 => "a", 0 => "b", 1 => "c"); ! $arr["-1"] = "e"; ! $arr["0"] = "f"; ! $arr["1"] = "g"; + print_r($arr); + echo "\n"; + var_dump($arr); exit; |
|
From: <tr...@us...> - 2003-02-13 11:36:55
|
Update of /cvsroot/basedb/basedb/include/web
In directory sc8-pr-cvs1:/tmp/cvs-serv1522/include/web
Modified Files:
hyb_common.inc.php
Log Message:
Updated image channel handling
Index: hyb_common.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/hyb_common.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** hyb_common.inc.php 3 Feb 2003 08:51:13 -0000 1.10
--- hyb_common.inc.php 13 Feb 2003 11:36:52 -0000 1.11
***************
*** 153,156 ****
--- 153,157 ----
$l =& $lab[$acqid];
+ $ch = (int)$ch;
$clink = isset($chnames[$ch]) ? html($chnames[$ch]) : "unknown";
if(isset($l[$ch]))
***************
*** 161,165 ****
// Image list for an imageacquisition. Makes its own table, wants to be
// in a form called ff.
! function imageList(&$acq, &$user, $edit)
{
global $tdbg;
--- 162,166 ----
// Image list for an imageacquisition. Makes its own table, wants to be
// in a form called ff.
! function imageList(&$acq, &$user, $edit, $titleextra = "")
{
global $tdbg;
***************
*** 175,180 ****
$sortorder = array(1, 1, 1, -1, 1, 1, -1, 0);
$defsort = 0;
makeSearchHeader($search, $headerfields, $sortorder, $defsort,
! "", "document.ff.submit();", "Images ".webHelp(92, 1), 2);
if($acq->mayEdit($user))
--- 176,183 ----
$sortorder = array(1, 1, 1, -1, 1, 1, -1, 0);
$defsort = 0;
+ if($titleextra != "")
+ $titleextra .= " ";
makeSearchHeader($search, $headerfields, $sortorder, $defsort,
! "", "document.ff.submit();", "Images $titleextra".webHelp(92, 1), 2);
if($acq->mayEdit($user))
|
|
From: <tr...@us...> - 2003-02-13 11:36:55
|
Update of /cvsroot/basedb/basedb/include/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv1522/include/classes
Modified Files:
acquisition.inc.php image.inc.php spotimage.inc.php
Log Message:
Updated image channel handling
Index: acquisition.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/acquisition.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** acquisition.inc.php 13 Feb 2003 08:47:45 -0000 1.13
--- acquisition.inc.php 13 Feb 2003 11:36:52 -0000 1.14
***************
*** 191,195 ****
while($row =& db_fetch_row($res))
$arr[] = $row[0];
! if(count($arr) == 1 && $arr[0] == 3)
return true;
if(count($arr) == 2 && $arr[0] == 1 && $arr[1] == 2)
--- 191,195 ----
while($row =& db_fetch_row($res))
$arr[] = $row[0];
! if(count($arr) == 1 && $arr[0] == IMAGE_CHANNEL_BOTH)
return true;
if(count($arr) == 2 && $arr[0] == 1 && $arr[1] == 2)
***************
*** 204,213 ****
$query = "SELECT i.channels, i.id FROM Image i ".
"WHERE i.`imageAcquisition` = $this->id ".
! "AND i.channels IN (1,2,3) ".
Item::whereRemovedAnd("i", 0)." ".
"ORDER BY channels";
$res = query($query);
$arr = array();
! $imgs = array(1 => 0, 2 => 0, 3 => 0);
while($row =& db_fetch_row($res))
{
--- 204,213 ----
$query = "SELECT i.channels, i.id FROM Image i ".
"WHERE i.`imageAcquisition` = $this->id ".
! "AND i.channels IN (1, 2, ".IMAGE_CHANNEL_BOTH.") ".
Item::whereRemovedAnd("i", 0)." ".
"ORDER BY channels";
$res = query($query);
$arr = array();
! $imgs = array(1 => 0, 2 => 0, IMAGE_CHANNEL_BOTH => 0);
while($row =& db_fetch_row($res))
{
***************
*** 218,227 ****
if($imgs[1] >= 1 && $imgs[2] >= 1)
$found++;
! if($imgs[3] >= 1)
$found++;
if(!$found)
return 1;
! if($found > 1 || $imgs[1] > 1 || $imgs[2] > 1 || $imgs[3] > 1)
return 2;
for($i = 0; $i < count($arr); $i++)
--- 218,230 ----
if($imgs[1] >= 1 && $imgs[2] >= 1)
$found++;
! if($imgs[IMAGE_CHANNEL_BOTH] >= 1)
$found++;
if(!$found)
return 1;
! if($found > 1 || $imgs[1] > 1 || $imgs[2] > 1 ||
! $imgs[IMAGE_CHANNEL_BOTH] > 1)
! {
return 2;
+ }
for($i = 0; $i < count($arr); $i++)
Index: image.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/image.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** image.inc.php 3 Feb 2003 20:13:18 -0000 1.14
--- image.inc.php 13 Feb 2003 11:36:52 -0000 1.15
***************
*** 26,29 ****
--- 26,35 ----
define("CLEN_IMAGE_NAME", 255);
+ define("IMAGE_CHANNEL_NONE", 0);
+ define("IMAGE_CHANNEL_ALL", -1);
+ define("IMAGE_CHANNEL_OTHER", -2);
+ define("IMAGE_CHANNEL_BOTH", -3);
+ define("IMAGE_CHANNEL_MAX", 8);
+
class Image extends Item
{
***************
*** 91,95 ****
function setChannels($val)
{
! $this->channels = (int)$val;
}
function setFileSize($val)
--- 97,102 ----
function setChannels($val)
{
! $this->channels = max(IMAGE_CHANNEL_BOTH,
! min(IMAGE_CHANNEL_MAX, (int)$val));
}
function setFileSize($val)
***************
*** 187,191 ****
$arr = array();
while($row =& db_fetch_row($res))
! $arr[$row[0]] = $row[1];
return $arr;
}
--- 194,198 ----
$arr = array();
while($row =& db_fetch_row($res))
! $arr[(int)$row[0]] = $row[1];
return $arr;
}
***************
*** 212,219 ****
function getChannelNames()
{
! $names = array(-1 => "All", -3 => "Both", 0 => "None");
! for($i = 1; $i < 9; $i++)
$names[$i] = "Ch $i";
! $names[-2] = "Other";
return $names;
}
--- 219,228 ----
function getChannelNames()
{
! $names = array(IMAGE_CHANNEL_ALL => "All",
! IMAGE_CHANNEL_BOTH => "Ch1 and 2",
! IMAGE_CHANNEL_NONE => "None");
! for($i = 1; $i <= IMAGE_CHANNEL_MAX; $i++)
$names[$i] = "Ch $i";
! $names[IMAGE_CHANNEL_OTHER] = "Other";
return $names;
}
Index: spotimage.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/spotimage.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** spotimage.inc.php 3 Feb 2003 20:13:19 -0000 1.9
--- spotimage.inc.php 13 Feb 2003 11:36:52 -0000 1.10
***************
*** 98,102 ****
// $imgs is an array with either two images (keys 1 and 2) or one image
! // (key -3).
function runSpotImageChopper($dir, $imgs)
{
--- 98,102 ----
// $imgs is an array with either two images (keys 1 and 2) or one image
! // (key IMAGE_CHANNEL_BOTH).
function runSpotImageChopper($dir, $imgs)
{
***************
*** 135,139 ****
{
echo "Splitting two-channel TIFF image\n";
! $imgBoth = $imgs[-3];
$fileBoth = escapeshellarg(
Image::getRepositoryFilenameById($imgBoth));
--- 135,139 ----
{
echo "Splitting two-channel TIFF image\n";
! $imgBoth = $imgs[IMAGE_CHANNEL_BOTH];
$fileBoth = escapeshellarg(
Image::getRepositoryFilenameById($imgBoth));
***************
*** 184,188 ****
return "Spot images already exist or are being processed";
$imgs = Image::getBriefForJpeg($raw->getImageAcquisition());
! if(count($imgs) == 1 && isset($imgs[-3]))
;
else if(count($imgs) == 2 && isset($imgs[1]) && isset($imgs[2]))
--- 184,188 ----
return "Spot images already exist or are being processed";
$imgs = Image::getBriefForJpeg($raw->getImageAcquisition());
! if(count($imgs) == 1 && isset($imgs[IMAGE_CHANNEL_BOTH]))
;
else if(count($imgs) == 2 && isset($imgs[1]) && isset($imgs[2]))
***************
*** 196,200 ****
{
$BC->endTransaction();
! return "Unable to lock data set for spot image processing";
}
$dir = $raw->getSpotImageDirectory(true);
--- 196,200 ----
{
$BC->endTransaction();
! return "Unable to lock raw data set for spot image processing";
}
$dir = $raw->getSpotImageDirectory(true);
|
|
From: <tr...@us...> - 2003-02-13 10:38:07
|
Update of /cvsroot/basedb/basedb/include/local_distr In directory sc8-pr-cvs1:/tmp/cvs-serv26240/include/local_distr Added Files: .cvsignore Log Message: Ignoring Makefile.in but not Makefile.am --- NEW FILE: .cvsignore --- Makefile.in Makefile |
|
From: <tr...@us...> - 2003-02-13 10:38:07
|
Update of /cvsroot/basedb/basedb/include In directory sc8-pr-cvs1:/tmp/cvs-serv26240/include Added Files: .cvsignore Log Message: Ignoring Makefile.in but not Makefile.am --- NEW FILE: .cvsignore --- Makefile.in Makefile |
|
From: <tr...@us...> - 2003-02-13 10:38:06
|
Update of /cvsroot/basedb/basedb/include/common In directory sc8-pr-cvs1:/tmp/cvs-serv26240/include/common Added Files: .cvsignore Log Message: Ignoring Makefile.in but not Makefile.am --- NEW FILE: .cvsignore --- Makefile.in Makefile |
|
From: <tr...@us...> - 2003-02-13 10:38:06
|
Update of /cvsroot/basedb/basedb/include/drivers In directory sc8-pr-cvs1:/tmp/cvs-serv26240/include/drivers Added Files: .cvsignore Log Message: Ignoring Makefile.in but not Makefile.am --- NEW FILE: .cvsignore --- Makefile.in Makefile |
|
From: <tr...@us...> - 2003-02-13 10:37:19
|
Update of /cvsroot/basedb/basedb/include/web In directory sc8-pr-cvs1:/tmp/cvs-serv26240/include/web Added Files: .cvsignore Log Message: Ignoring Makefile.in but not Makefile.am --- NEW FILE: .cvsignore --- Makefile.in Makefile |
|
From: <tr...@us...> - 2003-02-13 10:37:19
|
Update of /cvsroot/basedb/basedb/misc In directory sc8-pr-cvs1:/tmp/cvs-serv26240/misc Added Files: .cvsignore Log Message: Ignoring Makefile.in but not Makefile.am --- NEW FILE: .cvsignore --- Makefile.in Makefile |
|
From: <tr...@us...> - 2003-02-13 10:36:35
|
Update of /cvsroot/basedb/basedb/plugins In directory sc8-pr-cvs1:/tmp/cvs-serv26240/plugins Modified Files: .cvsignore Log Message: Ignoring Makefile.in but not Makefile.am Index: .cvsignore =================================================================== RCS file: /cvsroot/basedb/basedb/plugins/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 1 Feb 2003 12:52:50 -0000 1.1 --- .cvsignore 13 Feb 2003 10:16:36 -0000 1.2 *************** *** 1 **** ! bin --- 1,2 ---- ! Makefile.in ! Makefile |
