Changeset 8246 for trunk/MagicSoft

Timestamp:

01/11/07 15:31:42 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/db/builddatasets.php (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -89 +89 @@
        his/her username now)
      - fixed password query in case user inserted something wrong
+     - implemented check, if on-sequences have different observations 
+       modes 
+     - implemented check, if user has chosen one sequences as on and off
+     - adapted text of password prompt
 
    * datacenter/db/builddatasets.php, datasetinfo-aio.php, 

trunk/MagicSoft/Mars/datacenter/db/builddatasets.php

@@ -511 +511 @@
                             $sequoff.=str_replace("Off", " ", $key);
                     }
+
                 printf("<input type='submit' value='Get Dataset'><br><br>\n");
                 printf("<input name='submit' type='hidden' value='post'>\n");
@@ -614 +615 @@
 //                printf("found %s keys", $numrealkeys);
 
+                //check observationmode for on-sequences
+                $query="SELECT fObservationModeKEY FROM Sequences where fSequenceFirst IN ('" . $sequences . "') GROUP BY fObservationModeKEY";
+//                printf("q: %s <br>", $query);
+                $result = mysql_query($query, $db_id);
+                $numobskeys=mysql_num_rows($result);
+                mysql_free_result($result);
+
 
                 $runtimelimit=5;
@@ -680 +688 @@
                                $color["WARN"], "WARN", str_word_count($sourceson));
                     */
+                    $doubleseq=0;
+//                    printf("finding: %s<br>", $sequon);
+                    foreach(explode(" ", $sequon) as $n => $s)
+                    {
+//                        printf("finding %s in %s <br>", $s, $sequoff);
+                        if (ereg($s, $sequoff))
+                        $doubleseq++;
+                    }
+                    if ($doubleseq>0)
+                    {
+                        printf("<li style='color:%s'>%s: You have selected sequences (%s) as On AND Off",
+                               $color["ERROR"], "ERROR", $doubleseq);
+                        $numerr=$numerr+1;
+                    }
                     if ($numrealkeys>1)
                     {
                         printf("<li style='color:%s'>%s: You have selected more than one (%s) on source",
-                               $color["ERROR"], "ERROR", $numrealkeays);
+                               $color["ERROR"], "ERROR", $numrealkeys);
+                        $numerr=$numerr+1;
+                    }
+                    if ($numobskeys>1)
+                    {
+                        printf("<li style='color:%s'>%s: You have selected more than one (%s) different observation modes for your on sequences",
+                               $color["ERROR"], "ERROR", $numobskeys);
                         $numerr=$numerr+1;
                     }
@@ -893 +921 @@
     if (!isset($_SERVER['PHP_AUTH_USER']) || crypt($_SERVER['PHP_AUTH_PW'], $sitepw)!=$sitepw || $_SERVER['PHP_AUTH_USER']!=$siteuser)
     {
-        header('WWW-Authenticate: Basic realm="My Realm"');
+        header('WWW-Authenticate: Basic realm="Build Datasets"');
         header('HTTP/1.0 401 Unauthorized');
-        echo 'Text to send if user hits Cancel button';
+        echo 'Cancelled.';
         return;
     }