Merge branch 'innova-dev-update' of https://gitea.doesworks.net/giteaadmin/DUTAS into innova-dev-update

CICS/RCSIGNON.cob

@@ -24,31 +24,22 @@
           05 LK-DATA    PIC X(1).
        PROCEDURE DIVISION.
 
-         DISPLAY '=== Hello!'.
-
          IF EIBCALEN = 0
            EXEC CICS 
                GETMAIN SET(ADDRESS OF DFHCOMMAREA)
                FLENGTH(LENGTH OF DFHCOMMAREA) 
            END-EXEC
-           DISPLAY '=== Sending Map'
+
            MOVE 0 TO LK-DATA
            PERFORM SEND-MAP
          END-IF.
 
          IF LK-DATA = 0
-           DISPLAY '=== Receiving Map'
            MOVE 1 TO LK-DATA
            PERFORM REC-MAP
          END-IF.
 
-         IF LK-DATA = 1
-           DISPLAY '=== New user logged on'
-           MOVE 2 TO LK-DATA
-           PERFORM SHOW-ID
-         END-IF.
-
-         DISPLAY "=== You should never get here! (" LK-DATA ")".
+         DISPLAY "=== You should never get here!".
          GOBACK.
 
        SEND-MAP.
@@ -86,8 +77,6 @@
       * Remove from possible mem dumps
            MOVE SPACES TO PASSWO
 
-           DISPLAY '=== Signon'
-
            EXEC CICS SIGNON
       *       USERID('LETMEIN0')
              USERID('        ')
@@ -124,8 +113,12 @@
                LENGTH(LENGTH OF DFHCOMMAREA)
              END-EXEC
            END-IF
-           
-           DISPLAY "=== Switching user"
+
+           EXEC CICS
+             SET TERMINAL(EIBTRMID)
+             UCTRANST('UCTRAN')
+           END-EXEC
+
            EXEC CICS
               SEND MAP('SUXESS') MAPSET('SIGNON')
               ERASE
@@ -134,15 +127,8 @@
            END-EXEC
            EXEC CICS
              RETURN TRANSID('DTS')
-      *       COMMAREA(DFHCOMMAREA)
-      *       LENGTH(LENGTH OF DFHCOMMAREA)
            END-EXEC.
 
-       SHOW-ID.
-           EXEC CICS ASSIGN USERID(WS-USERID) END-EXEC
-           DISPLAY '=== CICS USERID:' WS-USERID
-           EXEC CICS LINK PROGRAM('DTSCDRV') END-EXEC
-           GOBACK.
 
 
 

CICS/UCTRAN41.cob

@@ -5,22 +5,15 @@
        DATA DIVISION.
        WORKING-STORAGE SECTION.
 
-       01  CAPARM           PIC X(1).
        01  UCTRANST         PIC X(8).
-       01  EIBTRMID         PIC X(4).
-       01  EIBTRNID         PIC X(4).
-       01  EIBCALEN         PIC S9(4) COMP.
 
        LINKAGE SECTION.
        01  DFHCOMMAREA.
-           05  FILLER       PIC X(1).
+           05  CAPARM       PIC X(1).
 
        PROCEDURE DIVISION.
 
-           EXEC CICS RETURN END-EXEC.
-
-           MOVE EIBTRMID TO EIBTRMID
-           MOVE EIBTRNID TO EIBTRNID
+      *     EXEC CICS RETURN END-EXEC.
 
            IF EIBTRMID = SPACES
                EXEC CICS ABEND ABCODE('UCTR') END-EXEC
@@ -29,20 +22,20 @@
            IF EIBCALEN = 0
                PERFORM FLIP-UCTRAN
            ELSE
-               EXEC CICS RETRIEVE INTO(CAPARM) LENGTH(1) END-EXEC
                IF CAPARM = 'U'
                    MOVE 'UCTRAN' TO UCTRANST
-               ELSE IF CAPARM = 'L'
-                   MOVE 'NOUCTRAN' TO UCTRANST
                ELSE
-                   EXEC CICS ABEND ABCODE('UCTR') END-EXEC
+                   IF CAPARM = 'L'
+                       MOVE 'NOUCTRAN' TO UCTRANST
+                   ELSE
+                       EXEC CICS ABEND ABCODE('UCTR') END-EXEC
+                   END-IF
                END-IF
                PERFORM APPLY-SETTING
            END-IF
             
- 
             EXEC CICS RETURN END-EXEC.
-           GOBACK.
+
        FLIP-UCTRAN.
            EXEC CICS INQUIRE TERMINAL(EIBTRMID) UCTRANST(UCTRANST)
                 END-EXEC