[Bdadev-cvs] TuneReqStore TuneInfo.h,1.7,1.8 TuneRequestStore.cpp,1.13,1.14 TuneRequestStore.h,1.11,1.12

[<ad...@us...>]

Update of /cvsroot/bdadev/TuneReqStore
In directory sc8-pr-cvs1:/tmp/cvs-serv26170

Modified Files:
	TuneInfo.h TuneRequestStore.cpp TuneRequestStore.h 
Log Message:
Bug fixes


Index: TuneInfo.h
===================================================================
RCS file: /cvsroot/bdadev/TuneReqStore/TuneInfo.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TuneInfo.h	25 Feb 2003 17:20:13 -0000	1.7
--- TuneInfo.h	26 Feb 2003 08:18:25 -0000	1.8
***************
*** 47,54 ****
  
  BEGIN_PROP_MAP(CTuneInfo)
! PROP_ENTRY("TuneRequest", 1, CLSID_NULL)
! PROP_ENTRY("Description", 2, CLSID_NULL)
! PROP_ENTRY("UniqueID", 3, CLSID_NULL)
! PROP_ENTRY("KeyedNumber", 4, CLSID_NULL)
  END_PROP_MAP()
  
--- 47,54 ----
  
  BEGIN_PROP_MAP(CTuneInfo)
! PROP_ENTRY("TuneRequest", 2, CLSID_NULL)
! PROP_ENTRY("Description", 3, CLSID_NULL)
! PROP_ENTRY("UniqueID", 4, CLSID_NULL)
! PROP_ENTRY("KeyedNumber", 5, CLSID_NULL)
  END_PROP_MAP()
  
***************
*** 75,79 ****
  
  private:
!     typedef CComEnumOnSTL<IEnumProgramInfo, &IID_IEnumProgramInfo, IProgramInfo*, _Copy<IProgramInfo*>, std::vector<IProgramInfo*> > ComSTLEnum;
  
  
--- 75,79 ----
  
  private:
!     typedef CComEnumOnSTL<IEnumProgramInfo, &IID_IEnumProgramInfo, IProgramInfo*, _CopyInterface<IProgramInfo>, std::vector<IProgramInfo*> > ComSTLEnum;
  
  

Index: TuneRequestStore.cpp
===================================================================
RCS file: /cvsroot/bdadev/TuneReqStore/TuneRequestStore.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** TuneRequestStore.cpp	25 Feb 2003 17:20:13 -0000	1.13
--- TuneRequestStore.cpp	26 Feb 2003 08:18:25 -0000	1.14
***************
*** 359,363 ****
          CHECK(pElem->get_text(&Name));
          pVar->vt = VT_DISPATCH;
!         return GetTuningSpace(Name, (ITuningSpace**) &pVar->pdispVal);
      }
      else
--- 359,364 ----
          CHECK(pElem->get_text(&Name));
          pVar->vt = VT_DISPATCH;
!         CHECK(hr = GetTuningSpace(Name, (ITuningSpace**) &pVar->pdispVal));
!         return hr;
      }
      else
***************
*** 499,502 ****
--- 500,506 ----
          if (vt == VT_UNKNOWN || vt == VT_DISPATCH)
          {
+             CComVariant Variant(VT_BSTR);
+             CHECK(pElem->setAttribute(CComBSTR(L"vt"), Variant));
+     
              CComQIPtr<ITuningSpace> TuningSpace = pVar->punkVal;
              if(TuningSpace)
***************
*** 1147,1163 ****
  
              Result = m_GuideData->GetProgramProperties(ProgramId, &EnumProgramProperties);
!             CHECK(Result);
! 
!             CComBSTR Title;
!             CComBSTR Description;
  
!             Result = GetGuideDataProperty(EnumProgramProperties, L"Description.Title", Title);
!             CHECK(Result);
  
!             Result = GetGuideDataProperty(EnumProgramProperties, L"Description.One Sentence", Description);
!             CHECK(Result);
  
!             Result = UpdateScheduleInfo(ServiceId, ScheduleID.bstrVal, Title, Description, StartTime, EndTime);
!             CHECK(Result);
  
              ScheduleID.Clear();
--- 1151,1168 ----
  
              Result = m_GuideData->GetProgramProperties(ProgramId, &EnumProgramProperties);
!             if(SUCCEEDED(Result))
!             {
!                 CComBSTR Title;
!                 CComBSTR Description;
  
!                 Result = GetGuideDataProperty(EnumProgramProperties, L"Description.Title", Title);
!                 CHECK(Result);
  
!                 Result = GetGuideDataProperty(EnumProgramProperties, L"Description.One Sentence", Description);
!                 CHECK(Result);
  
!                 Result = UpdateScheduleInfo(ServiceId, ScheduleID.bstrVal, Title, Description, StartTime, EndTime);
!                 CHECK(Result);
!             }
  
              ScheduleID.Clear();
***************
*** 1184,1189 ****
      if (cCount > 0)
      {
!         CComVariant Item(0);
!         return TuningSpaces->get_Item(Item, pDisp);
      }
      else
--- 1189,1196 ----
      if (cCount > 0)
      {
!         CComPtr<IEnumTuningSpaces> EnumTuneSpaces;
!         CHECK(TuningSpaces->get_EnumTuningSpaces(&EnumTuneSpaces));
!         ULONG Items(0);
!         return EnumTuneSpaces->Next(1, pDisp, &Items);
      }
      else
***************
*** 1197,1200 ****
--- 1204,1210 ----
  //
  // $Log$
+ // Revision 1.14  2003/02/26 08:18:25  adcockj
+ // Bug fixes
+ //
  // Revision 1.13  2003/02/25 17:20:13  adcockj
  // Fixed VB compability issues with schedule info

Index: TuneRequestStore.h
===================================================================
RCS file: /cvsroot/bdadev/TuneReqStore/TuneRequestStore.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TuneRequestStore.h	25 Feb 2003 17:20:14 -0000	1.11
--- TuneRequestStore.h	26 Feb 2003 08:18:25 -0000	1.12
***************
*** 100,104 ****
  	ElementStack m_stackElems;
      
!     typedef CComEnumOnSTL<IEnumTuneInfo, &IID_IEnumTuneInfo, ITuneInfo*, _Copy<ITuneInfo*>, std::vector<ITuneInfo*> > ComSTLEnum;
  	CComPtr<xml::IXMLDOMDocument> m_doc;
  	CComPtr<xml::IXMLDOMElement> m_TopElement;
--- 100,104 ----
  	ElementStack m_stackElems;
      
!     typedef CComEnumOnSTL<IEnumTuneInfo, &IID_IEnumTuneInfo, ITuneInfo*, _CopyInterface<ITuneInfo>, std::vector<ITuneInfo*> > ComSTLEnum;
  	CComPtr<xml::IXMLDOMDocument> m_doc;
  	CComPtr<xml::IXMLDOMElement> m_TopElement;