Changeset 5744


Ignore:
Timestamp:
Nov 20, 2019, 1:46:11 PM (3 years ago)
Author:
olle
Message:

Refs #1029. Updates of BASE method calls due to update of BASE version to "3.15.0". Calls of Application.getSessionControl(ID, "", req.getRemoteAddr(), true) changed to Application.getSessionControl(ID, null, req.getRemoteAddr(), true), i.e. value of argument externalClientId changed from an empty string to null:

  1. Java class/file Meludi.java in src/net/sf/basedb/meludi/.
  2. Java servlet classes/files in src/net/sf/based/meludi/servlet/:
    a. BaseLineRegistrationServlet.java
    b. CaseSummaryServlet.java
    c. ConsentFormServlet.java
    d. DnaServlet.java
    e. ExtractionServlet.java
    f. InstallServlet.java
    g. LabelGenerationServlet.java
    h. LibPrepServlet.java
    i. MeludiQuarterMonthReportServlet.java
    j. PersonalRegistrationServlet.java
    k. ProtocolServlet.java
    l. ReferralGeneratorServlet.java
    m. SampleReportServlet.java
    n. SessionServlet.java
    o. SpecimenTubeServlet.java
    p. SubtypeServlet.java
Location:
extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/Meludi.java

    r5708 r5744  
    13231323    //return Application.getSessionControl(req.getParameter("ID"), client.getExternalId());
    13241324    //  public static SessionControl getSessionControl(String sessionControlId, String externalClientId, String remoteId, boolean checkLoggedIn)
    1325     return Application.getSessionControl(req.getParameter("ID"), client.getExternalId(), req.getRemoteAddr(), checkLoggedIn);
     1325    //return Application.getSessionControl(req.getParameter("ID"), client.getExternalId(), req.getRemoteAddr(), checkLoggedIn);
     1326    return Application.getSessionControl(req.getParameter("ID"), null, req.getRemoteAddr(), checkLoggedIn);
    13261327  }
    13271328

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/BaseLineRegistrationServlet.java

    r5468 r5744  
    9898 
    9999    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    100     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     100    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     101    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    101102    DbControl dc = null;
    102103    try
    … …  
    11751176 
    11761177    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    1177     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     1178    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     1179    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    11781180    DbControl dc = null;
    11791181    try

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/CaseSummaryServlet.java

    r5468 r5744  
    8282 
    8383    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    84     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     84    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     85    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    8586    DbControl dc = null;
    8687    try
    … …  
    575576    JSONArray jsonMessages = new JSONArray();
    576577    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    577     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     578    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     579    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    578580    DbControl dc = null;
    579581       

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/ConsentFormServlet.java

    r5468 r5744  
    7070    //final SessionControl sc = Meludi.getSessionControl(req);
    7171    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    72     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     72    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     73    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    7374    DbControl dc = null;
    7475    System.out.println("ConsentFormServlet::doGet(): cmd = \"" + cmd + "\" Start");
    … …  
    424425    //final SessionControl sc = Meludi.getSessionControl(req);
    425426    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    426     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     427    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     428    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    427429    DbControl dc = null;
    428430    System.out.println("ConsentFormServlet::doPost(): cmd = \"" + cmd + "\" Start");

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/DnaServlet.java

    r5468 r5744  
    9595   
    9696    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    97     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     97    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     98    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    9899    DbControl dc = null;
    99100    try
    … …  
    573574 
    574575    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    575     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     576    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     577    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    576578    DbControl dc = null;
    577579    try

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/ExtractionServlet.java

    r5468 r5744  
    9292 
    9393    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    94     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     94    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     95    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    9596    DbControl dc = null;
    9697    try
    … …  
    21372138 
    21382139    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    2139     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     2140    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     2141    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    21402142    DbControl dc = null;
    21412143    try

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/InstallServlet.java

    r5686 r5744  
    130130 
    131131    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    132     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     132    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     133    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    133134    DbControl dc = null;
    134135    try

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/LabelGenerationServlet.java

    r5468 r5744  
    6161   
    6262    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    63     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     63    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     64    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    6465    DbControl dc = null;   
    6566           

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/LibPrepServlet.java

    r5468 r5744  
    163163   
    164164    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    165     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     165    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     166    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    166167    DbControl dc = null;
    167168    try
    … …  
    17051706 
    17061707    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    1707     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     1708    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     1709    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    17081710    DbControl dc = null;
    17091711    try

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/MeludiQuarterMonthReportServlet.java

    r5468 r5744  
    152152   
    153153    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    154     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     154    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     155    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    155156    DbControl dc = null;   
    156157    dc = sc.newDbControl();       

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/PersonalRegistrationServlet.java

    r5468 r5744  
    7878 
    7979    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    80     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     80    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     81    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    8182    DbControl dc = null;
    8283    try
    … …  
    306307 
    307308    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    308     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     309    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     310    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    309311    DbControl dc = null;
    310312    try

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/ProtocolServlet.java

    r5468 r5744  
    5454 
    5555    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    56     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     56    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     57    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    5758    DbControl dc = null;
    5859    try

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/ReferralGeneratorServlet.java

    r5733 r5744  
    187187    //final SessionControl sc = Meludi.getSessionControl(req);
    188188    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    189     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     189    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     190    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    190191    DbControl dc = null;
    191192    // Get site prefix length

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/SampleReportServlet.java

    r5468 r5744  
    9494   
    9595    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    96     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     96    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     97    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    9798    DbControl dc = null;   
    9899    dc = sc.newDbControl();       

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/SessionServlet.java

    r5468 r5744  
    6262        {
    6363          //sc = Application.getSessionControl(ID, req.getRemoteAddr());
    64           sc = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     64          //sc = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     65          sc = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    6566          if (sc.isLoggedIn())
    6667          {
    … …  
    8687      {
    8788        //sc = Application.getSessionControl(ID, req.getRemoteAddr());
    88         sc = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     89        //sc = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     90        sc = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    8991        dc = sc.newDbControl();
    9092        Path path = new Path(req.getParameter("path"), Path.Type.DIRECTORY);
    … …  
    106108        //json.put("counts", CounterService.getInstance().getCurrentCounts());
    107109        //sc = Application.getSessionControl(ID, req.getRemoteAddr());
    108         sc = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     110        //sc = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     111        sc = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    109112        int activeProjectId = sc.getActiveProjectId();
    110113        json.put("counts", CounterService.getInstance().getCurrentProjectCounts(activeProjectId));
    … …  
    113116      {
    114117        //sc = Application.getSessionControl(ID, req.getRemoteAddr());
    115         sc = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     118        //sc = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     119        sc = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    116120        String projectName = "- no active project -";
    117121        int activeProjectId = sc.getActiveProjectId();
    … …  
    131135        //json.put("counts", CounterService.getInstance().getCurrentCounts());
    132136        //sc = Application.getSessionControl(ID, req.getRemoteAddr());
    133         sc = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     137        //sc = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     138        sc = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    134139        int activeProjectId = sc.getActiveProjectId();
    135140        JSONObject jsonConf = new JSONObject();

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/SpecimenTubeServlet.java

    r5468 r5744  
    7676   
    7777    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    78     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     78    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     79    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    7980    DbControl dc = null;
    8081    try
    … …  
    642643    JSONArray jsonMessages = new JSONArray();
    643644    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    644     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     645    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     646    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    645647    DbControl dc = null;
    646648   

  • extensions/net.sf.basedb.meludi/trunk/src/net/sf/basedb/meludi/servlet/SubtypeServlet.java

    r5468 r5744  
    4848 
    4949    //final SessionControl sc = Application.getSessionControl(ID, req.getRemoteAddr());
    50     final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     50    //final SessionControl sc  = Application.getSessionControl(ID, "", req.getRemoteAddr(), true);
     51    final SessionControl sc  = Application.getSessionControl(ID, null, req.getRemoteAddr(), true);
    5152    DbControl dc = null;
    5253    try
Note: See TracChangeset for help on using the changeset viewer.