[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] tools/dtdriver/engine ffdriver.cpp,1.73,1.74
From:       jgordon () helixcommunity ! org
Date:       2011-06-30 19:00:23
Message-ID: 201106301900.p5UJ0uh5016156 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/tools/dtdriver/engine
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5568

Modified Files:
	ffdriver.cpp 
Log Message:
Synopsis
========
Adds an option to pass through the option headers to request header
Branches: PRODUCER_14_0_RN, HEAD
Reviewer: sfu


Description
===========
Adds an option to pass through the option headers in the request header


Files Affected
==============
datatype/tools/dtdriver/engine/ffdriver.cpp
datatype/tools/dtdriver/engine/pub/ffdriver.h


Index: ffdriver.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/engine/ffdriver.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- ffdriver.cpp	3 May 2011 12:38:27 -0000	1.73
+++ ffdriver.cpp	30 Jun 2011 19:00:21 -0000	1.74
@@ -663,6 +663,10 @@
             {
                 uOptFlag = QUIET_OPTION;
             }
+            else if (strcmp(pOptName, PROPOGATE_OPTION_NAME) == 0)
+            {
+                uOptFlag = PROPOGATE_OPTION;
+            }
             else
             {
                 bIsFlagOption = FALSE;
@@ -681,16 +685,16 @@
             }
             else
             {
-				if (strcmp(pOptName, USENUGGETFORMAT_OPTION_NAME) == 0)
-		{
-		    m_bUseNuggetFormat = uOptValue ? TRUE : FALSE;
-		    if (m_bUseNuggetFormat &&
-			(m_uBandwidth == 0) &&
-			(!m_bBandwidthExplicitlySet))
+                if (strcmp(pOptName, USENUGGETFORMAT_OPTION_NAME) == 0)
+                {
+                    m_bUseNuggetFormat = uOptValue ? TRUE : FALSE;
+                    if (m_bUseNuggetFormat &&
+                        (m_uBandwidth == 0) &&
+                        (!m_bBandwidthExplicitlySet))
                     {
                         m_uBandwidth = 0x7FFFFFFF;
                     }
-		}
+                }
                 else if (strcmp(pOptName, RATE_OPTION_NAME) == 0)
                 {
                     m_uBandwidth = uOptValue;
@@ -729,14 +733,14 @@
                         m_ulMinBwThreshold = uOptValue;
                     }
                 }
-				  else if (strcmp(pOptName, PACE_OPTION_NAME) == 0)
+                                  else if (strcmp(pOptName, PACE_OPTION_NAME) == 0)
                 {
-		    m_ulProcessingRate = uOptValue;
-		    if (m_ulProcessingRate > (0xFFFFFFFF / 100))
-		    {
-			// Processing rate exceed max we can compute with - just set it to infinite
-			m_ulProcessingRate = 0;
-		    }
+                    m_ulProcessingRate = uOptValue;
+                    if (m_ulProcessingRate > (0xFFFFFFFF / 100))
+                    {
+                        // Processing rate exceed max we can compute with - just set it to infinite
+                        m_ulProcessingRate = 0;
+                    }
                 }
                 else if (strcmp(pOptName, SERVER_OPTION_NAME) == 0)
                 {
@@ -749,7 +753,7 @@
                 else if (strcmp(pOptName, JUMPSTART_OPTION_NAME) == 0)
                 {
                     m_ulStartTime = uOptValue;
-		    m_bStartTimeExplicitlySet = TRUE;
+                    m_bStartTimeExplicitlySet = TRUE;
                 }
                 else if (strcmp(pOptName, PROCESSUNTIL_OPTION_NAME) == 0)
                 {
@@ -1298,7 +1302,8 @@
                     // is set, then we will copy the options into the request header.
                     //
                     // Is the "ProcessTimeUnits" set?
-                    HXBOOL bCopyOptionsIntoRequestHeader = (m_ulProcessTimeUnits ? TRUE : FALSE);
+                    HXBOOL bCopyOptionsIntoRequestHeader = 
+                        ((m_uOptionFlags & PROPOGATE_OPTION) || m_ulProcessTimeUnits);
 
                     HXLOGL3(HXLOG_DTDR, "FFDriver::Drive() calling MiniContext::InitFileFormat()");
 		    status = m_pContext->InitFileFormat(m_pFileFormat,


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]