Index: trunk/MagicSoft/Mars/datacenter/db/builddatasets.php
===================================================================
--- trunk/MagicSoft/Mars/datacenter/db/builddatasets.php (revision 9498)
+++ trunk/MagicSoft/Mars/datacenter/db/builddatasets.php (revision 9505)
@@ -78,5 +78,5 @@
if ($_SESSION[$key]=="On")
if ($key!="fLinks" && $key!="fOff" && $key!="fOnlyOff")
- if (!(ereg("^[0-9]*ON$", $key) || ereg("^[0-9]*Off$", $key)))
+ if (!(ereg("^DSSeq[0-9]*$", $key)))
if (empty($checkwhere[$key]) || $checkwhere[$key]==0)
$query0 .= ", " . $key . " as '" . $alias[$key] . "' ";
@@ -94,5 +94,6 @@
$query0 .= GetJoin($fromtable,$key);
- if ($_SESSION["DisplaySelected"]!="yes" || ($_SESSION["sequon"]==" " && $_SESSION["sequoff"]==" "))
+ if ($_SESSION["DisplaySelected"]!="yes"
+ || ($_SESSION["sequon"]==" " && $_SESSION["sequoff"]==" "))
{
if ($_SESSION["fTest"]!="On")
@@ -199,4 +200,17 @@
$starstop=substr($_SESSION["fStarStop"], 0, 10);
$query0 .= " fStar < '" . $starstop . " 23:59:59' ";
+ }
+
+ if ($_SESSION["DisplaySelected"]=="inverse")
+ {
+ $displsequ=str_replace(" ", " ", $_SESSION["sequon"].$_SESSION["sequoff"]);
+ $displsequ=ereg_replace("^ ", "(", $displsequ);
+ $displsequ=ereg_replace("$", ")", $displsequ);
+ $displsequ=str_replace(" ", ",", $displsequ);
+
+ if (strpos(strrev($query0), " DNA ")!=0 || !strpos(strrev($query0), " DNA "))
+ $query0 .= " AND ";
+
+ $query0 .= " fSequenceFirst NOT IN " . $displsequ;
}
@@ -232,5 +246,5 @@
$displsequ=str_replace(" ", " ", $_SESSION["sequon"].$_SESSION["sequoff"]);
$displsequ=ereg_replace("^ ", "(", $displsequ);
- $displsequ=ereg_replace(" $", ")", $displsequ);
+ $displsequ=ereg_replace("$", ")", $displsequ);
$displsequ=str_replace(" ", ",", $displsequ);
@@ -395,15 +409,8 @@
PrintMagicTable($result0, $alias, $rightalign, $limitsmean, $limitsmin, $limitsmax, $result1, "yes");
- if ($_SESSION["sequon"]!=" " || $_SESSION["sequoff"]!=" ")
+ if (!(empty($_SESSION["sequon"]) && empty($_SESSION["sequoff"])))
{
printf("\n");
printf("Remark: To store your selection you have to press 'Update Data Set'
\n");
- if ($_SESSION["DisplaySelected"]!="yes" && ($_SESSION["sequon"]!=" " || $_SESSION["sequoff"]!=" "))
- {
- printf("Remark: To be able to remove sequence(s) from your selection you have to \n");
- printf("'Display Selected Sequences'");
-// printf("\n", GetClearedURL("yes"));
- printf(" only.
\n");
- }
printf("
\n");
@@ -412,4 +419,17 @@
$on=str_replace(" ", ",", trim($_SESSION["sequon"]));
$off=str_replace(" ", ",", trim($_SESSION["sequoff"]));
+
+ //set observation mode
+ if ($_SESSION["sequoff"]==" ")
+ $obsmode="Wobble";
+ else
+ $obsmode="On";
+
+ //get key from db for insert query
+ $query = "SELECT fObservationModeKEY FROM ObservationMode WHERE fObservationModeName='".$obsmode."'";
+ $result = mysql_query($query);
+ $row = mysql_fetch_assoc($result);
+ $_SESSION["obsmode"] = $row["fObservationModeKEY"];
+ mysql_free_result($result);
$values=array("Sum(fRunTime)/60" => $runtime,
@@ -555,34 +575,34 @@
if ($values["Min(fNumStarsCorMed)"][$val]<$numstarscorlimit)
- printf("
%s: One of your %s-sequences has less than %s correlated stars (%s). \n",
+ printf("%s: At least one of your %s-sequences has less than %s correlated stars (%s). \n",
$color["WARN"], "WARN", $val, $numstarscorlimit, $values["Min(fNumStarsCorMed)"][$val]);
if ($values["Min(fNumStarsMed)"][$val]<$numstarslimit)
- printf("%s: One of your %s-sequences has less than %s identified stars (%s). \n",
+ printf("%s: At least one of your %s-sequences has less than %s identified stars (%s). \n",
$color["WARN"], "WARN", $val, $numstarslimit, $values["Min(fNumStarsMed)"][$val]);
if ($values["Min(fRunTime)/60"][$val]<$runtimelimit)
- printf("%s: One of your %s-sequences is shorter than %s min (%s min). \n",
+ printf("%s: At least one of your %s-sequences is shorter than %s min (%s min). \n",
$color["INFO"], "INFO", $val, $runtimelimit, $values["Min(fRunTime)/60"][$val]);
if ($values["Max(fInhomogeneity)"][$val]>$inhomlimit)
- printf("%s: One of your %s-sequences has an inhomogeneity larger than %s (%s). \n",
+ printf("%s: At least one of your %s-sequences has an inhomogeneity larger than %s (%s). \n",
$color["WARN"], "WARN", $val, $inhomlimit, $values["Max(fInhomogeneity)"][$val]);
if ($values["Max(fUnsuitableInner)"][$val]>$unsuitablemaxlimit)
- printf("%s: One of your %s-sequences has more than %s unsuitable inner pixel (%s). \n",
+ printf("%s: At least one of your %s-sequences has more than %s unsuitable inner pixel (%s). \n",
$color["WARN"], "WARN", $val, $unsuitablemaxlimit, $values["Max(fUnsuitableInner)"][$val]);
if ($values["Max(fIsolatedInner)"][$val]>$isolatedlimit)
- printf("%s: One of your %s-sequences has more than %s isolated inner pixel (%s). \n",
- $color["WARN"], "WARN", $val, $isolatedlimit, $values["Max(fIsolatedInner)"][$val]);
+ printf("%s: At least one of your %s-sequences has more than %s isolated inner pixel (%s). \n",
+ $color["WARN"], "WARN", $val, $isolatedlimit, $values["Max(fIsolatedInner)"][$val]);
if ($values["Max(fIsolatedMaxCluster)"][$val]>$imclimit)
- printf("%s: One of your %s-sequences has more than %s isolated max cluster (%s). \n",
+ printf("%s: At least one of your %s-sequences has more than %s isolated max cluster (%s). \n",
$color["WARN"], "WARN", $val, $imclimit, $values["Max(fIsolatedMaxCluster)"][$val]);
}
//check selected dataset for errors
if (!empty($on) && $values["Max(fMeanPedRmsInner)"]["on"]>$values["Avg(fMeanPedRmsInner)"]["on"]+$pedrmsrms)
- printf("%s: One of your on-sequences has a PedRms larger than %s (%s).\n",
+ printf("%s: At least one of your on-sequences has a PedRms larger than %s (%s).\n",
$color["WARN"], "WARN", $values["Avg(fMeanPedRmsInner)"]["on"]+$pedrmsrms, $values["Max(fMeanPedRmsInner)"]["on"]);
if (!empty($off) && $values["Max(fMeanPedRmsInner)"]["off"]>$values["Avg(fMeanPedRmsInner)"]["on"]+$pedrmsrms)
- printf("%s: One of your off-sequences has a PedRms larger than %s (%s). \n",
+ printf("%s: At least one of your off-sequences has a PedRms larger than %s (%s). \n",
$color["WARN"], "WARN", $values["Avg(fMeanPedRmsInner)"]["on"]+$pedrmsrms, $values["Max(fMeanPedRmsInner)"]["off"]);
if (!empty($off) && $values["Min(fMeanPedRmsInner)"]["off"]<$values["Avg(fMeanPedRmsInner)"]["on"]-$pedrmsrms)
- printf("%s: One of your off-sequences has a PedRms smaller than %s (%s). \n",
+ printf("%s: At least one of your off-sequences has a PedRms smaller than %s (%s). \n",
$color["WARN"], "WARN", $values["Avg(fMeanPedRmsInner)"]["on"]-$pedrmsrms, $values["Min(fMeanPedRmsInner)"]["off"]);
$scale=$values["Sum(fRunTime)/60"]["on"]/$values["Sum(fRunTime)/60"]["off"];
@@ -598,6 +618,6 @@
if ($obskey!=$_SESSION["obsmode"])
{
- printf("%s: You have not selected any Off sequences. \n",
- $color["ERROR"], "ERROR", $doubleseq);
+ printf("%s: You have a mistake in your observation mode. \n",
+ $color["ERROR"], "ERROR");
$numerr=$numerr+1;
}
@@ -659,15 +679,4 @@
printf("SequencesOff: %s
\n", $_SESSION["sequoff"]);
- //set observation mode
- if ($_SESSION["sequoff"]==" ")
- $obsmode="Wobble";
- else
- $obsmode="On";
- //get key from db for insert query
- $query = "SELECT fObservationModeKEY FROM ObservationMode WHERE fObservationModeName='".$obsmode."'";
- $result = mysql_query($query);
- $row = mysql_fetch_assoc($result);
- $_SESSION["obsmode"] = $row["fObservationModeKEY"];
- mysql_free_result($result);
printf("Observation mode: %s
\n", $obsmode);
printf("RunTime: %s min
\n", $_SESSION["runtime"]);
@@ -738,5 +747,8 @@
}
else
+ {
printf("
\n");
+ printf("Remark: To store your selection you have to press 'Get Data Set'
\n");
+ }
printf("\n");
@@ -789,41 +801,26 @@
$_SESSION[$element]=$value;
-
-
if ($debug)
print_r($_SESSION);
- // remove sequence from selection
- if (!empty($_POST) && $_SESSION["DisplaySelected"]=="yes" && $_SESSION["DisplaySelectedOld"]=="yes")
- foreach ($_SESSION as $key => $element)
- if (($_SESSION[$key]=="On") //value is set
- && (ereg("^[0-9]*ON$", $key) || ereg("^[0-9]*Off$", $key)) // it is a sequence number
- && (!$_POST[$key]==On)) // the sequence is not given in $_POST any more
- unset($_SESSION[$key]);
-
- //store old value of $_SESSION["DisplaySelected"]
if ($_SESSION["DisplaySelected"]=="yes")
{
unset($_SESSION["fNumStart"]);
$_GET["fNumStart"]=0;
- $_SESSION["DisplaySelectedOld"]="yes";
- }
- else
- $_SESSION["DisplaySelectedOld"]="no";
-
- $_SESSION["sequon"]=" ";
- $_SESSION["sequoff"]=" ";
+ }
+
+ $_SESSION["sequon"]="";
+ $_SESSION["sequoff"]="";
foreach($_SESSION as $key => $val)
- if ($val=="On")
- {
- if (ereg("^[0-9]*ON$", $key))
- $_SESSION["sequon"].=str_replace("ON", " ", $key);
- if (ereg("^[0-9]*Off$", $key))
- $_SESSION["sequoff"].=str_replace("Off", " ", $key);
- }
- if ($_SESSION["sequon"]==" " && $_SESSION["sequoff"]==" ")
- {
- $_SESSION["DisplaySelected"]="no";
- $_SESSION["DisplaySelectedOld"]="no";
+ {
+ if ($val=="ON" && ereg("^DSSeq[0-9]*$", $key))
+ $_SESSION["sequon"].=str_replace("DSSeq", " ", $key);
+
+ if ($val=="Off" && ereg("^DSSeq[0-9]*$", $key))
+ $_SESSION["sequoff"].=str_replace("DSSeq", " ", $key);
+
+ if ($val=="Not" && ereg("^DSSeq[0-9]*$", $key))
+ unset($_SESSION[$key]);
+
}
@@ -855,4 +852,5 @@
{
// echo crypt($_SERVER['PHP_AUTH_PW']). "
";
+// echo "with crypt: " . crypt($_SERVER['PHP_AUTH_PW'], $userrow["fPassword"]) . " for user " . $userrow["fUserName"]. "
";
if (crypt($_SERVER['PHP_AUTH_PW'], $userrow["fPassword"])==$userrow["fPassword"]
&& $_SERVER['PHP_AUTH_USER']==$userrow["fUserName"])
@@ -882,5 +880,4 @@
header("Content-Disposition: attachment; filename=dataset_".str_replace(" ", "_", $_SESSION["name"]).".txt");
PrintDataSetFile();
- echo "hallo\n";
}
unset($_SESSION["fSendTxt"]);