From 9d1d2c1ce46f6833b176cc0f022b6bff8826809d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 13 Jul 2017 10:27:53 -0400
Subject: [PATCH] print the line out all at once, fixing the missing comma
 after fps.

---
 onvif/scripts/zmonvif-probe.pl | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl
index 7d4eaa25b..de6c18aa3 100755
--- a/onvif/scripts/zmonvif-probe.pl
+++ b/onvif/scripts/zmonvif-probe.pl
@@ -250,19 +250,9 @@ sub profiles
 
  my $profiles = $result->get_Profiles();
 
- foreach  my $profile ( @{ $profiles } ) {
+ foreach my $profile ( @{ $profiles } ) {
  
    my $token = $profile->attr()->get_token() ;
-   my $VideoEncoderConfiguration = $profile->get_VideoEncoderConfiguration();
-   print join(', ', $token, 
-         $profile->get_Name(),
-         ( $VideoEncoderConfiguration ? (
-                                         $VideoEncoderConfiguration->get_Encoding(),
-                                         $VideoEncoderConfiguration->get_Resolution()->get_Width(),
-                                         $VideoEncoderConfiguration->get_Resolution()->get_Height(),
-                                         $VideoEncoderConfiguration->get_RateControl()->get_FrameRateLimit(),
-                                        ) : () )
-       );
 
    # Specification gives conflicting values for unicast stream types, try both.
    # http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl#op.GetStreamUri
@@ -281,9 +271,18 @@ sub profiles
    die $result if not $result;
   #  print $result . "\n";
 
-    print $result->get_MediaUri()->get_Uri() .
-          "\n";
- }
+   my $VideoEncoderConfiguration = $profile->get_VideoEncoderConfiguration();
+   print join(', ', $token, 
+         $profile->get_Name(),
+         ( $VideoEncoderConfiguration ? (
+                                         $VideoEncoderConfiguration->get_Encoding(),
+                                         $VideoEncoderConfiguration->get_Resolution()->get_Width(),
+                                         $VideoEncoderConfiguration->get_Resolution()->get_Height(),
+                                         $VideoEncoderConfiguration->get_RateControl()->get_FrameRateLimit(),
+                                        ) : () ),
+         $result->get_MediaUri()->get_Uri() ,
+       ).  "\n";
+ } # end foreach profile
 
 #
 # use message parser without schema validation ???