ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/xmltv_parser/trunk/libxmltv/Core/XMLTVChannelCollection.cs
(Generate patch)

Comparing trunk/libxmltv/Core/XMLTVChannel.cs (file contents):
Revision 27 by william, Thu Mar 7 12:11:41 2013 UTC vs.
Revision 28 by william, Thu Mar 7 12:51:53 2013 UTC

# Line 35 | Line 35 | namespace libxmltv.Core
35              foreach (var c in doc.Descendants(XMLTV_CONSTANTS.CHANNEL_ELEMENT))
36              {
37                  Channel channel = new Channel(c);
38 <                entries.Add(channel.ChannelId, channel);
38 >                entries.Add(channel.Id, channel);
39              }
40          }
41          public override string ToString()
# Line 49 | Line 49 | namespace libxmltv.Core
49      {
50          public Channel()
51          {
52 <            ChannelId = string.Empty;
53 <            ChannelNumber = 0;
54 <            ChannelCallSign = string.Empty;
55 <            ChannelName = string.Empty;
52 >            Id = string.Empty;
53 >            Number = 0;
54 >            CallSign = string.Empty;
55 >            Name = string.Empty;
56          }
57          public Channel(XElement e)
58              : this()
59          {
60              // get the channel id
61 <            ChannelId = e.Attribute(XMLTV_CONSTANTS.Channels.ChannelId).Value;
61 >            Id = e.Attribute(XMLTV_CONSTANTS.Channels.ChannelId).Value;
62              var names = e.Descendants(XMLTV_CONSTANTS.Channels.ChannelDisplayName).ToList();
63 <            ChannelNumber = Convert.ToInt32(names[1].Value);
64 <            ChannelCallSign = names[2].Value;
65 <            ChannelName = names[3].Value;
63 >            Number = Convert.ToInt32(names[1].Value);
64 >            CallSign = names[2].Value;
65 >            Name = names[3].Value;
66          }
67          #region IXMLTVChannel members
68 <        public string ChannelId { get; private set; }
69 <        public int ChannelNumber { get; private set; }
70 <        public string ChannelCallSign { get; private set; }
71 <        public string ChannelName { get; private set; }
68 >        public string Id { get; private set; }
69 >        public int Number { get; private set; }
70 >        public string CallSign { get; private set; }
71 >        public string Name { get; private set; }
72          #endregion
73 +        public override string ToString()
74 +        {
75 +            return string.Format("{0}: {1} {2} ({3})", Id,Number,Name, CallSign);
76 +        }
77      }
78   }
79  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines