Changeset 1789


Ignore:
Timestamp:
Dec 17, 2012, 10:21:30 AM (8 years ago)
Author:
Nicklas Nordborg
Message:

References #422, #424 and #425. Renamed 'Stratagene' to 'Stratagene.r' to follow the general naming convention for RNA items.

Location:
extensions/net.sf.basedb.reggie/branches/ticket-422
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/branches/ticket-422/resources/libprep/mrna_protocol2.jsp

    r1745 r1789  
    128128    var rna = mrna.rna;
    129129    // Set the 'stratagene' flag
    130     rna.stratagene = rna.name == 'Stratagene';
     130    rna.stratagene = rna.name == STRATAGENE_NAME;
    131131    // Set the 'QC' flag if more than 1.2µg is used
    132132    rna.qc = rna.usedQuantity > 1.2;
  • extensions/net.sf.basedb.reggie/branches/ticket-422/resources/libprep/select_rna.jsp

    r1770 r1789  
    284284    var tmp = {};
    285285    tmp.name = name;
    286     tmp.stratagene = name == 'Stratagene';
     286    tmp.stratagene = name == STRATAGENE_NAME;
    287287    tmp.replicate = false;
    288288    tmp.info = rna.infoByName(name);
     
    298298    var tmp = {};
    299299    tmp.name = info.name;
    300     tmp.stratagene = tmp.name == 'Stratagene';
     300    tmp.stratagene = tmp.name == STRATAGENE_NAME;
    301301    tmp.replicate = false;
    302302    tmp.id = info.id;
     
    643643  }
    644644 
    645   var info = Rna.infoByName('Stratagene');
     645  var info = Rna.infoByName(STRATAGENE_NAME);
    646646  if (!info.id)
    647647  {
    648     alert('Could not find any RNA with name=Stratagene. Please check that it exists on the server.');
     648    alert('Could not find any RNA with name=\''+STRATAGENE_NAME+'\'. Please check that it exists on the server.');
    649649    return;
    650650  }
  • extensions/net.sf.basedb.reggie/branches/ticket-422/resources/reggie.js

    r1758 r1789  
    22var WELL_ALPHA = [ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'];
    33
     4var STRATAGENE_NAME = 'Stratagene.r';
    45
    56/**
  • extensions/net.sf.basedb.reggie/branches/ticket-422/src/net/sf/basedb/reggie/servlet/InstallServlet.java

    r1782 r1789  
    163163       
    164164        // Special items
    165         jsonChecks.add(checkExtract(dc, "Stratagene", Subtype.RNA, effectiveOptions, createIfMissing));
     165        jsonChecks.add(checkExtract(dc, "Stratagene.r", Subtype.RNA, effectiveOptions, createIfMissing));
    166166       
    167167        // Plugin definitions and configurations
  • extensions/net.sf.basedb.reggie/branches/ticket-422/testdata/mrna.txt

    r1783 r1789  
    1 Stratagene  A 2 QC
    2 Stratagene  B 2 QC
    3 Stratagene  C 2 QC
    4 Stratagene  D 2 QC
    5 Stratagene  E 2 QC
    6 Stratagene  F 2 QC
    7 Stratagene  G 2 QC
    8 Stratagene  H 2 QC
     1Stratagene.r  A 2 QC
     2Stratagene.r  B 2 QC
     3Stratagene.r  C 2 QC
     4Stratagene.r  D 2 QC
     5Stratagene.r  E 2 QC
     6Stratagene.r  F 2 QC
     7Stratagene.r  G 2 QC
     8Stratagene.r  H 2 QC
    992205784.1.l.r A 3
    10103305337.1.l.r B 3
     
    16164405555.1.l.r H 3
    17177700293.1.l.r A 4
    18 Stratagene  B 4 QC
     18Stratagene.r  B 4 QC
    19193305332.1.l.r C 4
    20203305338.1.l.r D 4
     
    25254405538.1.l.r A 5
    26267700277.1.l.r B 5
    27 Stratagene2 C 5 QC
     27Stratagene.r2 C 5 QC
    28287700302.1.l.r D 5
    29292205787.1.l.r E 5
     
    42426605924.1.l.r B 7
    43437700283.1.l.r C 7
    44 Stratagene2 D 7 QC
     44Stratagene.r2 D 7 QC
    45451106229.1.l.r E 7
    46467700307.1.l.r F 7
     
    63634405568.1.l.r G 9
    64647700314.1.l.r H 9
    65 Stratagene  A 10  QC
     65Stratagene.r  A 10  QC
    66665506126.1.l.r B 10
    67677700314.4.l.r C 10
     
    71712205793.1.l.r G 10
    72722205798.1.l.r H 10
    73 Stratagene  A 11  QC
    74 Stratagene  B 11  QC
    75 Stratagene  C 11  QC
    76 Stratagene  D 11  QC
    77 Stratagene  E 11  QC
    78 Stratagene  F 11  QC
    79 Stratagene  G 11  QC
    80 Stratagene  H 11  QC
     73Stratagene.r  A 11  QC
     74Stratagene.r  B 11  QC
     75Stratagene.r  C 11  QC
     76Stratagene.r  D 11  QC
     77Stratagene.r  E 11  QC
     78Stratagene.r  F 11  QC
     79Stratagene.r  G 11  QC
     80Stratagene.r  H 11  QC
    8181duptest.1.l.r B 12
    8282duptest.2.l.r B 12
Note: See TracChangeset for help on using the changeset viewer.