Changeset 4978

Timestamp:

Sep 24, 2018, 10:51:24 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #1054: Even more functionality in the Flagged alignment wizard

Sorting items in order from Specimen->Lysate->RNA->Library to make results predictable in the case that two or more items from the same parent-child chain are selected.

File:

• extensions/net.sf.basedb.reggie/trunk/resources/flaggedalignment/search.js (modified) (3 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/flaggedalignment/search.js

@@ -1090 +1090 @@
           if (okToUse.value == 'ok-rna')
           {
-            item = {'type': 'EXTRACT', 'id': aligned.rna.id, 'okToUse': true };
+            item = {'type': 'EXTRACT', 'id': aligned.rna.id, 'okToUse': true, 'sort': 5 };
           }
           else if (okToUse.value == 'ok-library')
           {
-            item = {'type': 'EXTRACT', 'id': aligned.lib.id, 'okToUse': true };
+            item = {'type': 'EXTRACT', 'id': aligned.lib.id, 'okToUse': true, 'sort': 6 };
           }
         }
         else if (doNotUse.value == 'specimen')
         {
-          item = {'type': 'SAMPLE', 'id': aligned.specimen.id, 'doNotUse': 'Specimen' };
+          item = {'type': 'SAMPLE', 'id': aligned.specimen.id, 'doNotUse': 'Specimen', 'sort': 1 };
         }
         else if (doNotUse.value == 'lysate')
         {
-          item = {'type': 'EXTRACT', 'id': aligned.lysate.id, 'doNotUse': 'Lysate' };
+          item = {'type': 'EXTRACT', 'id': aligned.lysate.id, 'doNotUse': 'Lysate', 'sort': 2 };
         }
         else if (doNotUse.value == 'rna')
         {
-          item = {'type': 'EXTRACT', 'id': aligned.rna.id, 'doNotUse': 'RNA' };
+          item = {'type': 'EXTRACT', 'id': aligned.rna.id, 'doNotUse': 'RNA', 'sort': 3 };
         }
         else if (doNotUse.value == 'library')
         {
-          item = {'type': 'EXTRACT', 'id': aligned.lib.id, 'doNotUse': 'Library' };
+          item = {'type': 'EXTRACT', 'id': aligned.lib.id, 'doNotUse': 'Library', 'sort': 4 };
         }
         else if (aligned.flagged && doNotUse.classList.contains('required'))
@@ -1179 +1179 @@
       url += '&highHetFilter=1';
     }
+    
+    // Sort items in the "correct" order. All DoNotUse items before OkToUse
+    // and Specimen -> Lysate -> RNA -> Library
+    // This will prevent prevent problems with non-deterministic result if
+    // selecting, for example, "Specimen" and "RNA" from the same parent-child chain
+    // With sorting the highest level (Specimen) wins
+    items.sort(Sort.sortDoNotUseItems);
     
     var submitInfo = {};
@@ -1270 +1277 @@
   }
   
+  // Sort items that are sent for "DoNotUse" or "OkToUse" by the 'sort' propert.
+  sort.sortDoNotUseItems = function(a, b)
+  {
+    return a.sort == b.sort ? a.id - b.id : a.sort - b.sort;
+  }
+  
   return sort;
 }();