Minor fixes.

dabamos · Mar 5, 2024 · df4012c · df4012c
1 parent d7ee6c4
commit df4012c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/app/dmfs.f90 b/app/dmfs.f90
@@ -351,9 +351,9 @@ pure function request_name_string(request_name, i, n, observ_name) result(str)
         character(len=:), allocatable          :: str          !! Result.
 
         if (present(n)) then
-            str = 'request ' // trim(request_name) // ' (' // dm_itoa(i) // ')'
-        else
             str = 'request ' // trim(request_name) // ' (' // dm_itoa(i) // ' of ' // dm_itoa(n) // ')'
+        else
+            str = 'request ' // trim(request_name) // ' (' // dm_itoa(i) // ')'
         end if
 
         if (present(observ_name)) then

diff --git a/app/dmpipe.f90 b/app/dmpipe.f90
@@ -352,9 +352,9 @@ pure function request_name_string(request_name, i, n, observ_name) result(str)
         character(len=:), allocatable          :: str          !! Result.
 
         if (present(n)) then
-            str = 'request ' // trim(request_name) // ' (' // dm_itoa(i) // ')'
-        else
             str = 'request ' // trim(request_name) // ' (' // dm_itoa(i) // ' of ' // dm_itoa(n) // ')'
+        else
+            str = 'request ' // trim(request_name) // ' (' // dm_itoa(i) // ')'
         end if
 
         if (present(observ_name)) then

diff --git a/app/dmserial.f90 b/app/dmserial.f90
@@ -433,11 +433,6 @@ integer function read_observ(tty, observ, node_id, sensor_id, source, debug) res
                                         observ=observ, error=response%error)
                     cycle
                 end if
-
-                if (debug_) then
-                    call dm_log_debug('extracted response ' // trim(response%name) // ' of ' // &
-                                      request_name_string(request%name, i), observ=observ)
-                end if
             end do
 
             if (debug_) then
@@ -468,9 +463,9 @@ pure function request_name_string(request_name, i, n, observ_name) result(str)
         character(len=:), allocatable          :: str          !! Result.
 
         if (present(n)) then
-            str = 'request ' // trim(request_name) // ' (' // dm_itoa(i) // ')'
-        else
             str = 'request ' // trim(request_name) // ' (' // dm_itoa(i) // ' of ' // dm_itoa(n) // ')'
+        else
+            str = 'request ' // trim(request_name) // ' (' // dm_itoa(i) // ')'
         end if
 
         if (present(observ_name)) then

diff --git a/test/dmtestlogger.f90 b/test/dmtestlogger.f90
@@ -21,7 +21,7 @@ logical function test01() result(stat)
             '"1970-01-01T00:00:00.000000+00:00", "node_id": "test-node", "sensor_id": "test-sensor", ' // &
             '"target_id": "test-target", "observ_id": "6b0ca75ae594425a8d38adfd709b11cd", ' // &
             '"message": "test message" }'
-        character(len=*), parameter :: LOGGER_NAME  = 'dmlogger'
+        character(len=*), parameter :: LOGGER_NAME  = 'dmtestlogger'
         character(len=*), parameter :: TEST_MESSAGE = 'test message'
         integer,          parameter :: TEST_ERROR   = E_DUMMY
         integer,          parameter :: TEST_LEVEL   = LVL_INFO