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

List:       helix-client-cvs
Subject:    [Client-cvs] encodesvc/include ihxtconstants.h, 1.62,
From:       tburton () helixcommunity ! org
Date:       2010-01-29 0:52:00
Message-ID: 201001290053.o0T0rCOT015787 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/client/encodesvc/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv13200

Modified Files:
	ihxtconstants.h ihxtencodingjob.h 
Log Message:
Description: Fixed Bug 256585: Producer treats output filenames containing 
substitution vars as relative and prepends working dir
================================================
The problem here was that HXBuildInstanceAfterTransformFromBuffer was 
returning HXR_FAIL if a file destination was invalid 
(i.e. Filename=“%InputFilePath%/test.rm”). This result was then used to tell 
the cli or activex that the job was invalid.

The solution was to do token substitution in deserializeJobFromBuffer and 
deserializeJob.
- These two functions are called when HXBuildInstanceFromFile and 
HXBuildInstanceFromBuffer are called.
- Each function has a CHXTElement (xml element)
- Add JobFile to the CHXTElement in deserializeJob (from file).
- Do token substitution on each CHXTElement with a new token replacer.
- Let the ReadEncodingJob create the encoding job from the CHXTElement 
that has substitution.


Description: Fixed Bug 256913: 
Remove job filename argument from StartEncoding function.
================================================
Job filename was provided to StartEncoding because the token replacer in 
StartEncoding needed to know the job file path to do substitution. To provide 
this, I was passing job filename to start encoding and then to the token 
replacer. This was not a good fix because of bug 256585 preventing job creation
 and StartEncoding was a common function that should not need job filename. 
 A new fix was to add the job filename to the encoding job. 
This fix required the following:
1) Add JobFile to the job xsd
2) Remove the job filename from StartEncoding calls (remove old fix)
3) Insert the job filename into the encoding job
4) Have the gui insert JobFile into the job buffer (Dura did this)
5) Handle JobFile similar to JobName. This includes passing on it in 
OnSetString calls.
 

Files Changed:
================================================ 
client/encodesvc/activex/ctrl/ProducerCtrl.cpp
producerapps/cmdproducer/session.cpp
client/encodesvc/common/util/hxccfhelper.cpp
client/encodesvc/include/ihxtconstants.h
client/encodesvc/include/ihxtencodingjob.h
client/encodesvc/engine/encsession/encodingjob.cpp
client/encodesvc/engine/encsession/encodingjob.h
client/encodesvc/engine/encsession/jobserial.cpp
client/encodesvc/engine/encsession/settingsadvisor.cpp
client/encodesvc/common/tokenreplacer/Umakefil
client/encodesvc/common/tokenreplacer/hxtbagtokenreplacer.cpp
client/encodesvc/common/tokenreplacer/hxtjobtokenreplacer.cpp
client/encodesvc/common/tokenreplacer/pub/hxtbagtokenreplacer.h
client/encodesvc/common/tokenreplacer/pub/hxtjobtokenreplacer.h
producerapps/installer/root/xmlschemas/job.3.0.xsd
 

Files Added:
================================================ 
client/encodesvc/common/tokenreplacer/hxtelementtokenreplacer.cpp
client/encodesvc/common/tokenreplacer/pub/hxtelementtokenreplacer.h


Branches:
================================================
13_0, HEAD

Index: ihxtconstants.h
===================================================================
RCS file: /cvsroot/client/encodesvc/include/ihxtconstants.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- ihxtconstants.h	27 Jan 2010 01:41:36 -0000	1.62
+++ ihxtconstants.h	29 Jan 2010 00:51:57 -0000	1.63
@@ -1007,6 +1007,9 @@
 //job file name 
 const char kPropJobName []              = "JobName";
 
+//full path of job file for token substitution
+const char kPropJobFile []              = "JobFile";
+
 //job file element names 
 
 const char kPropXmlns[]             = "xmlns";

Index: ihxtencodingjob.h
===================================================================
RCS file: /cvsroot/client/encodesvc/include/ihxtencodingjob.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ihxtencodingjob.h	21 Jan 2010 23:58:14 -0000	1.17
+++ ihxtencodingjob.h	29 Jan 2010 00:51:57 -0000	1.18
@@ -158,7 +158,7 @@
 {   
     STDMETHOD(CreateInstance) (THIS_ REFIID riid, IUnknown** ppNewInstance) PURE; 
     STDMETHOD(BuildInstance) (THIS_ REFIID riid, IHXTPropertyBag* pInitParams, \
IUnknown** ppNewInstance, HXBOOL bForceInitialization=FALSE, IHXTPropertyBag** \
                ppInitErrorBag=NULL) PURE;
-	STDMETHOD(BuildInstanceFromBuffer) (THIS_ REFIID riid, IHXBuffer* pXmlBuffer, \
IUnknown** ppNewInstance, HXBOOL bForceInitialization=FALSE, IHXTPropertyBag** \
ppInitErrorBag=NULL) PURE; +    STDMETHOD(BuildInstanceFromBuffer) (THIS_ REFIID \
riid, IHXBuffer* pXmlBuffer, IUnknown** ppNewInstance, HXBOOL \
bForceInitialization=FALSE, IHXTPropertyBag** ppInitErrorBag=NULL) PURE;  \
STDMETHOD(BuildInstanceFromFile) (THIS_ REFIID riid, const char* szPathname, \
IUnknown** ppNewInstance, HXBOOL bForceInitialization=FALSE, IHXTPropertyBag** \
ppInitErrorBag=NULL) PURE;  STDMETHOD(BuildInstanceFromObject) (THIS_ REFIID riid, \
IUnknown* pUnkExistingObj, IUnknown** ppUnkNewInstance, IHXTPropertyBag** \
ppReplaceProps=NULL, HXBOOL bForceInitialization=FALSE, IHXTPropertyBag** \
ppInitErrorBag=NULL) PURE;  };
@@ -267,7 +267,7 @@
 
 DECLARE_INTERFACE_(IHXTEncodingJob, IHXTConfigurationAgent)
 {
-    STDMETHOD(StartEncoding) (THIS_ HXBOOL bBlockUntilComplete=TRUE, const char* \
szJobFilePath=NULL) PURE; +    STDMETHOD(StartEncoding) (THIS_ HXBOOL \
bBlockUntilComplete=TRUE) PURE;  STDMETHOD(StopEncoding) (THIS) PURE;
     STDMETHOD(CancelEncoding) (THIS) PURE;
 


_______________________________________________
Client-cvs mailing list
Client-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/client-cvs


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