Changeset 3247

Timestamp:

06/04/06 13:15:41 (2 years ago)

Author:

timothy

Message:

One step closer to allowing SQL only transcripts.

Files:

• trunk/Models/JVChatEvent.h (modified) (2 diffs)
• trunk/Models/JVChatEvent.m (modified) (8 diffs)
• trunk/Models/JVChatMessage.h (modified) (4 diffs)
• trunk/Models/JVChatMessage.m (modified) (5 diffs)
• trunk/Models/JVChatSession.m (modified) (1 diff)
• trunk/Models/JVChatTranscript.h (modified) (2 diffs)
• trunk/Models/JVChatTranscript.m (modified) (11 diffs)
• trunk/Models/JVSQLChatTranscript.m (modified) (5 diffs)
• trunk/Models/JVStyle.m (modified) (5 diffs)
• trunk/Panels/JVChatTranscriptPanel.m (modified) (3 diffs)
• trunk/Resources/Styles/Bland.colloquyStyle/Contents/Resources/main.css (modified) (2 diffs)
• trunk/Resources/Styles/Bubbles.colloquyStyle/Contents/Resources/main.css (modified) (2 diffs)
• trunk/Resources/Styles/Bubbles.colloquyStyle/Contents/Resources/main.xsl (modified) (4 diffs)
• trunk/Resources/Styles/DecafBland.colloquyStyle/Contents/Resources/main.css (modified) (3 diffs)
• trunk/Resources/Styles/DecafBland.colloquyStyle/Contents/Resources/main.xsl (modified) (1 diff)
• trunk/Resources/Styles/Fiat.colloquyStyle/Contents/Resources/main.css (modified) (2 diffs)
• trunk/Resources/Styles/Fiat.colloquyStyle/Contents/Resources/main.xsl (modified) (5 diffs)
• trunk/Resources/Styles/Novel.colloquyStyle/Contents/Resources/main.css (modified) (1 diff)
• trunk/Resources/Styles/Novel.colloquyStyle/Contents/Resources/main.xsl (modified) (1 diff)
• trunk/Resources/Styles/Standard.colloquyStyle/Contents/Resources/main.css (modified) (2 diffs)
• trunk/Resources/Styles/Synapse.colloquyStyle/Contents/Resources/main.css (modified) (3 diffs)
• trunk/Resources/Styles/Synapse.colloquyStyle/Contents/Resources/main.xsl (modified) (4 diffs)
• trunk/Resources/default.xsl (modified) (2 diffs)
• trunk/Resources/roomTopicBanner.html (modified) (1 diff)
• trunk/Views/JVStyleView.m (modified) (9 diffs)

trunk/Models/JVChatEvent.h

@@ -4 +4 @@
-        @protected
-        /* xmlNode */ void *_node;
+        /* xmlDoc */ void *_doc;
-        NSString *_eventIdentifier;
-        NSScriptObjectSpecifier *_objectSpecifier;
@@ -30 +31 @@
-@end
-
-
-
-
-
+
-+ (id) chatEventWithName:(NSString *) name andMessage:(id) message;
-- (id) initWithName:(NSString *) name andMessage:(id) message;

trunk/Models/JVChatEvent.m

@@ -20 +20 @@
-        _transcript = nil; // weak reference
-        _node = NULL;
+
+        if( _doc ) xmlFreeDoc( _doc );
+        _doc = NULL;
-
-        [super dealloc];
@@ -105 +108 @@
-
-        _loadedAttributes = YES;
-}
-
-#pragma mark -
-
-- (void *) node {
-        return _node;
-}
-
-- (void) _setNode:(xmlNode *) node {
-        _node = node;
-}
-
-#pragma mark -
-
-- (JVChatTranscript *) transcript {
-        return _transcript;
-}
-
-- (NSString *) eventIdentifier {
-        return _eventIdentifier;
-}
-
-#pragma mark -
-
-- (NSDate *) date {
-        [self loadSmall];
-        return _date;
-}
-
-#pragma mark -
-
-- (NSString *) name {
-        [self loadSmall];
-        return _name;
-}
-
-#pragma mark -
-
-- (NSTextStorage *) message {
-        [self loadMessage];
-        return _message;
-}
-
-- (NSString *) messageAsPlainText {
-        return [[self message] string];
-}
-
-- (NSString *) messageAsHTML {
-        NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"IgnoreFonts", [NSNumber numberWithBool:YES], @"IgnoreFontSizes", nil];
-        return [[self message] HTMLFormatWithOptions:options];
-}
-
-#pragma mark -
-
-- (NSDictionary *) attributes {
-        [self loadAttributes];
-        return _attributes;
-}
-@end
-
-#pragma mark -
-
-@implementation JVMutableChatEvent
-+ (id) chatEventWithName:(NSString *) name andMessage:(id) message {
-        return [[[self alloc] initWithName:name andMessage:message] autorelease];
-}
-
-#pragma mark -
-
-- (id) init {
-        if( ( self = [super init] ) ) _doc = NULL;
-        return self;
-}
-
-- (id) initWithName:(NSString *) name andMessage:(id) message {
-        if( ( self = [self init] ) ) {
-                _loadedMessage = YES;
-                _loadedAttributes = YES;
-                _loadedSmall = YES;
-                [self setDate:[NSDate date]];
-                [self setName:name];
-                [self setMessage:message];
-                [self setEventIdentifier:[NSString locallyUniqueString]];
-        }
-
-        return self;
-}
-
-- (void) dealloc {
-        if( _doc ) xmlFreeDoc( _doc );
-        _doc = NULL;
-
-        [super dealloc];
-}
-
@@ -271 +181 @@
-}
-
-
+_
-        if( _doc ) {
-                xmlFreeDoc( _doc );
@@ -282 +192 @@
-#pragma mark -
-
+- (JVChatTranscript *) transcript {
+        return _transcript;
+}
+
+- (NSString *) eventIdentifier {
+        return _eventIdentifier;
+}
+
+#pragma mark -
+
+- (NSDate *) date {
+        [self loadSmall];
+        return _date;
+}
+
+- (NSString *) name {
+        [self loadSmall];
+        return _name;
+}
+
+#pragma mark -
+
+- (NSTextStorage *) message {
+        [self loadMessage];
+        return _message;
+}
+
+- (NSString *) messageAsPlainText {
+        return [[self message] string];
+}
+
+- (NSString *) messageAsHTML {
+        NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"IgnoreFonts", [NSNumber numberWithBool:YES], @"IgnoreFontSizes", nil];
+        return [[self message] HTMLFormatWithOptions:options];
+}
+
+#pragma mark -
+
+- (NSDictionary *) attributes {
+        [self loadAttributes];
+        return _attributes;
+}
+@end
+
+#pragma mark -
+
+@implementation JVMutableChatEvent
++ (id) chatEventWithName:(NSString *) name andMessage:(id) message {
+        return [[[self alloc] initWithName:name andMessage:message] autorelease];
+}
+
+#pragma mark -
+
+- (id) init {
+        if( ( self = [super init] ) ) _doc = NULL;
+        return self;
+}
+
+- (id) initWithName:(NSString *) name andMessage:(id) message {
+        if( ( self = [self init] ) ) {
+                _loadedMessage = YES;
+                _loadedAttributes = YES;
+                _loadedSmall = YES;
+                [self setDate:[NSDate date]];
+                [self setName:name];
+                [self setMessage:message];
+                [self setEventIdentifier:[NSString locallyUniqueString]];
+        }
+
+        return self;
+}
+
+#pragma mark -
+
-- (void) setDate:(NSDate *) date {
-
+_
-        [_date autorelease];
-        _date = [date copyWithZone:[self zone]];
@@ -289 +273 @@
-
-- (void) setName:(NSString *) name {
-
+_
-        [_name autorelease];
-        _name = [name copyWithZone:[self zone]];
@@ -297 +281 @@
-
-- (void) setMessage:(id) message {
-
+_
-        if( ! _message ) {
-                if( [message isKindOfClass:[NSTextStorage class]] ) _message = [message retain];
@@ -321 +305 @@
-
-- (void) setAttributes:(NSDictionary *) attributes {
-
+_
-        [_attributes autorelease];
-        _attributes = [attributes copyWithZone:[self zone]];
@@ -329 +313 @@
-
-- (void) setEventIdentifier:(NSString *) identifier {
-
+_
-        [_eventIdentifier autorelease];
-        _eventIdentifier = [identifier copyWithZone:[self zone]];

trunk/Models/JVChatMessage.h

@@ -10 +10 @@
-        @public
-        /* xmlNode */ void *_node;
+        /* xmlDoc */ void *_doc;
-        NSString *_messageIdentifier;
-        NSScriptObjectSpecifier *_objectSpecifier;
@@ -26 +27 @@
-        JVIgnoreMatchResult _ignoreStatus;
-        JVChatMessageType _type;
+        unsigned _consecutiveOffset;
-        BOOL _senderIsLocalUser;
-        BOOL _action;
@@ -36 +38 @@
-
-- (NSDate *) date;
+
+- (unsigned) consecutiveOffset;
-
-- (NSString *) senderName;
@@ -65 +69 @@
-        @protected
-        id _sender;
-        /* xmlDoc */ void *_doc;
-}
-+ (id) messageWithText:(id) body sender:(id) sender;

trunk/Models/JVChatMessage.m

@@ -131 +131 @@
-        _senderBuddyIdentifier = nil;
-
-        [super dealloc];
-}
-
-#pragma mark -
-
-- (void *) node {
-        return _node;
-}
-
-- (void) _setNode:(xmlNode *) node {
-        _node = node;
-}
-
-#pragma mark -
-
-- (NSDate *) date {
-        [self load];
-        return _date;
-}
-
-#pragma mark -
-
-- (NSString *) senderName {
-        [self loadSender];
-        return _senderName;
-}
-
-- (NSString *) senderIdentifier {
-        [self loadSender];
-        return _senderIdentifier;
-}
-
-- (NSString *) senderNickname {
-        [self loadSender];
-        return _senderNickname;
-}
-
-- (NSString *) senderHostmask {
-        [self loadSender];
-        return _senderHostmask;
-}
-
-- (NSString *) senderClass {
-        [self loadSender];
-        return _senderClass;
-}
-
-- (NSString *) senderBuddyIdentifier {
-        [self loadSender];
-        return _senderBuddyIdentifier;
-}
-
-- (BOOL) senderIsLocalUser {
-        [self loadSender];
-        return _senderIsLocalUser;
-}
-
-#pragma mark -
-
-- (NSTextStorage *) body {
-        [self loadBody];
-        return _attributedMessage;
-}
-
-- (NSString *) bodyAsPlainText {
-        return [[self body] string];
-}
-
-- (NSString *) bodyAsHTML {
-        NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"IgnoreFonts", [NSNumber numberWithBool:YES], @"IgnoreFontSizes", nil];
-        return [[self body] HTMLFormatWithOptions:options];
-}
-
-#pragma mark -
-
-- (BOOL) isAction {
-        [self load];
-        return _action;
-}
-
-- (BOOL) isHighlighted {
-        [self load];
-        return _highlighted;
-}
-
-- (JVIgnoreMatchResult) ignoreStatus {
-        [self load];
-        return _ignoreStatus;
-}
-
-- (JVChatMessageType) type {
-        [self load];
-        return _type;
-}
-
-#pragma mark -
-
-- (NSURL *) source {
-        [self load];
-        return _source;
-}
-
-- (JVChatTranscript *) transcript {
-        return _transcript;
-}
-
-- (NSString *) messageIdentifier {
-        return _messageIdentifier;
-}
-
-#pragma mark -
-
-- (NSScriptObjectSpecifier *) objectSpecifier {
-        return _objectSpecifier;
-}
-
-- (void) setObjectSpecifier:(NSScriptObjectSpecifier *) objectSpecifier {
-        id old = _objectSpecifier;
-        _objectSpecifier = [objectSpecifier retain];
-        [old release];
-}
-
-#pragma mark -
-
-- (NSString *) description {
-        return [self bodyAsPlainText];
-}
-
-- (NSString *) debugDescription {
-        return [NSString stringWithFormat:@"<%@ 0x%x [%@]: (%@) %@>", NSStringFromClass( [self class] ), (unsigned long) self, _messageIdentifier, [self senderNickname], [self body]];
-}
-
-#pragma mark -
-
-- (id) valueForUndefinedKey:(NSString *) key {
-        if( [NSScriptCommand currentCommand] ) {
-                [[NSScriptCommand currentCommand] setScriptErrorNumber:1000];
-                [[NSScriptCommand currentCommand] setScriptErrorString:[NSString stringWithFormat:@"The message id %@ doesn't have the \"%@\" property.", [self messageIdentifier], key]];
-                return nil;
-        }
-
-        return [super valueForUndefinedKey:key];
-}
-
-- (void) setValue:(id) value forUndefinedKey:(NSString *) key {
-        if( [NSScriptCommand currentCommand] ) {
-                // this is a non-mutable message, give AppleScript a good error if this is a script command call
-                [[NSScriptCommand currentCommand] setScriptErrorNumber:1000];
-                [[NSScriptCommand currentCommand] setScriptErrorString:[NSString stringWithFormat:@"The properties of message id %@ are read only.", key, [self messageIdentifier]]];
-                return;
-        }
-
-        [super setValue:value forUndefinedKey:key];
-}
-@end
-
-#pragma mark -
-
-@implementation JVMutableChatMessage
-+ (void) initialize {
-        [super initialize];
-        static BOOL tooLate = NO;
-        if( ! tooLate ) {
-                [[NSScriptCoercionHandler sharedCoercionHandler] registerCoercer:[self class] selector:@selector( coerceMessage:toString: ) toConvertFromClass:[JVMutableChatMessage class] toClass:[NSString class]];
-                [[NSScriptCoercionHandler sharedCoercionHandler] registerCoercer:[self class] selector:@selector( coerceString:toMessage: ) toConvertFromClass:[NSString class] toClass:[JVMutableChatMessage class]];
-                [[NSScriptCoercionHandler sharedCoercionHandler] registerCoercer:[self class] selector:@selector( coerceMessage:toTextStorage: ) toConvertFromClass:[JVMutableChatMessage class] toClass:[NSTextStorage class]];
-                [[NSScriptCoercionHandler sharedCoercionHandler] registerCoercer:[self class] selector:@selector( coerceTextStorage:toMessage: ) toConvertFromClass:[NSTextStorage class] toClass:[JVMutableChatMessage class]];
-                tooLate = YES;
-        }
-}
-
-+ (id) messageWithText:(id) body sender:(id) sender {
-        return [[[self allocWithZone:nil] initWithText:body sender:sender] autorelease];
-}
-
-#pragma mark -
-
-- (id) initWithText:(id) body sender:(id) sender {
-        if( ( self = [self init] ) ) {
-                _loaded = YES;
-                _bodyLoaded = YES;
-                _senderLoaded = YES;
-                [self setDate:[NSDate date]];
-                [self setBody:body];
-                [self setSender:sender];
-                [self setMessageIdentifier:[NSString locallyUniqueString]];
-        }
-
-        return self;
-}
-
-- (void) dealloc {
-        if( _doc ) xmlFreeDoc( _doc );
-        _doc = NULL;
-
-        [_sender release];
-        _sender = nil;
-
-        [super dealloc];
@@ -345 +150 @@
-                if( _source ) xmlSetProp( root, (xmlChar *) "source", (xmlChar *) [[[self source] absoluteString] UTF8String] );
-
-
-
+
+
+
+
+
+
-
-                        if( sendDesc ) {
@@ -356 +165 @@
-                                xmlFreeDoc( tempDoc );
-                        }
-if( [self senderName] ) 
-xmlChar *) [[self senderName] UTF8String]
+
+ [self senderName] ? (xmlChar *) [[self senderName] UTF8String] : @"" )
-                        if( [self senderIsLocalUser] ) xmlSetProp( child, (xmlChar *) "self", (xmlChar *) "yes" );
-                        if( [self senderNickname] && ! [[self senderName] isEqualToString:[self senderNickname]] )
@@ -369 +178 @@
-                        if( [self senderBuddyIdentifier] && ! [self senderIsLocalUser] )
-                                xmlSetProp( child, (xmlChar *) "buddy", (xmlChar *) [[self senderBuddyIdentifier] UTF8String] );
- else return NULL;
+
-
-                NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"IgnoreFonts", [NSNumber numberWithBool:YES], @"IgnoreFontSizes", nil];
@@ -400 +209 @@
-
-        _node = node;
+}
+
+#pragma mark -
+
+- (NSDate *) date {
+        [self load];
+        return _date;
+}
+
+#pragma mark -
+
+- (unsigned) consecutiveOffset {
+        [self load];
+        return _consecutiveOffset;
+}
+
+#pragma mark -
+
+- (NSString *) senderName {
+        [self loadSender];
+        return _senderName;
+}
+
+- (NSString *) senderIdentifier {
+        [self loadSender];
+        return _senderIdentifier;
+}
+
+- (NSString *) senderNickname {
+        [self loadSender];
+        return _senderNickname;
+}
+
+- (NSString *) senderHostmask {
+        [self loadSender];
+        return _senderHostmask;
+}
+
+- (NSString *) senderClass {
+        [self loadSender];
+        return _senderClass;
+}
+
+- (NSString *) senderBuddyIdentifier {
+        [self loadSender];
+        return _senderBuddyIdentifier;
+}
+
+- (BOOL) senderIsLocalUser {
+        [self loadSender];
+        return _senderIsLocalUser;
+}
+
+#pragma mark -
+
+- (NSTextStorage *) body {
+        [self loadBody];
+        return _attributedMessage;
+}
+
+- (NSString *) bodyAsPlainText {
+        return [[self body] string];
+}
+
+- (NSString *) bodyAsHTML {
+        NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"IgnoreFonts", [NSNumber numberWithBool:YES], @"IgnoreFontSizes", nil];
+        return [[self body] HTMLFormatWithOptions:options];
+}
+
+#pragma mark -
+
+- (BOOL) isAction {
+        [self load];
+        return _action;
+}
+
+- (BOOL) isHighlighted {
+        [self load];
+        return _highlighted;
+}
+
+- (JVIgnoreMatchResult) ignoreStatus {
+        [self load];
+        return _ignoreStatus;
+}
+
+- (JVChatMessageType) type {
+        [self load];
+        return _type;
+}
+
+#pragma mark -
+
+- (NSURL *) source {
+        [self load];
+        return _source;
+}
+
+- (JVChatTranscript *) transcript {
+        return _transcript;
+}
+
+- (NSString *) messageIdentifier {
+        return _messageIdentifier;
+}
+
+#pragma mark -
+
+- (NSScriptObjectSpecifier *) objectSpecifier {
+        return _objectSpecifier;
+}
+
+- (void) setObjectSpecifier:(NSScriptObjectSpecifier *) objectSpecifier {
+        id old = _objectSpecifier;
+        _objectSpecifier = [objectSpecifier retain];
+        [old release];
+}
+
+#pragma mark -
+
+- (NSString *) description {
+        return [self bodyAsPlainText];
+}
+
+- (NSString *) debugDescription {
+        return [NSString stringWithFormat:@"<%@ 0x%x [%@]: (%@) %@>", NSStringFromClass( [self class] ), (unsigned long) self, _messageIdentifier, [self senderNickname], [self body]];
+}
+
+#pragma mark -
+
+- (id) valueForUndefinedKey:(NSString *) key {
+        if( [NSScriptCommand currentCommand] ) {
+                [[NSScriptCommand currentCommand] setScriptErrorNumber:1000];
+                [[NSScriptCommand currentCommand] setScriptErrorString:[NSString stringWithFormat:@"The message id %@ doesn't have the \"%@\" property.", [self messageIdentifier], key]];
+                return nil;
+        }
+
+        return [super valueForUndefinedKey:key];
+}
+
+- (void) setValue:(id) value forUndefinedKey:(NSString *) key {
+        if( [NSScriptCommand currentCommand] ) {
+                // this is a non-mutable message, give AppleScript a good error if this is a script command call
+                [[NSScriptCommand currentCommand] setScriptErrorNumber:1000];
+                [[NSScriptCommand currentCommand] setScriptErrorString:[NSString stringWithFormat:@"The properties of message id %@ are read only.", key, [self messageIdentifier]]];
+                return;
+        }
+
+        [super setValue:value forUndefinedKey:key];
+}
+@end
+
+#pragma mark -
+
+@implementation JVMutableChatMessage
++ (void) initialize {
+        [super initialize];
+        static BOOL tooLate = NO;
+        if( ! tooLate ) {
+                [[NSScriptCoercionHandler sharedCoercionHandler] registerCoercer:[self class] selector:@selector( coerceMessage:toString: ) toConvertFromClass:[JVMutableChatMessage class] toClass:[NSString class]];
+                [[NSScriptCoercionHandler sharedCoercionHandler] registerCoercer:[self class] selector:@selector( coerceString:toMessage: ) toConvertFromClass:[NSString class] toClass:[JVMutableChatMessage class]];
+                [[NSScriptCoercionHandler sharedCoercionHandler] registerCoercer:[self class] selector:@selector( coerceMessage:toTextStorage: ) toConvertFromClass:[JVMutableChatMessage class] toClass:[NSTextStorage class]];
+                [[NSScriptCoercionHandler sharedCoercionHandler] registerCoercer:[self class] selector:@selector( coerceTextStorage:toMessage: ) toConvertFromClass:[NSTextStorage class] toClass:[JVMutableChatMessage class]];
+                tooLate = YES;
+        }
+}
+
++ (id) messageWithText:(id) body sender:(id) sender {
+        return [[[self allocWithZone:nil] initWithText:body sender:sender] autorelease];
+}
+
+#pragma mark -
+
+- (id) initWithText:(id) body sender:(id) sender {
+        if( ( self = [self init] ) ) {
+                _loaded = YES;
+                _bodyLoaded = YES;
+                _senderLoaded = YES;
+                [self setDate:[NSDate date]];
+                [self setBody:body];
+                [self setSender:sender];
+                [self setMessageIdentifier:[NSString locallyUniqueString]];
+        }
+
+        return self;
+}
+
+- (void) dealloc {
+        [_sender release];
+        _sender = nil;
+
+        [super dealloc];
-}
-

trunk/Models/JVChatSession.m

@@ -3 +3 @@
-
-@implementation JVChatSession
-- (id) initWithNode:(xmlNode *) node andTranscript:(JVChatTranscript *) transcript {
-        if( ( self = [self init] ) ) {
-                _node = node;
-                _transcript = transcript; // weak reference
-
-                if( ! _node || node -> type != XML_ELEMENT_NODE ) {
-                        [self release];
-                        return nil;
-                }
-
-                @synchronized( _transcript ) {
-                        xmlChar *startedStr = xmlGetProp( (xmlNode *) _node, (xmlChar *) "started" );
-                        _startDate = ( startedStr ? [[NSDate allocWithZone:[self zone]] initWithString:[NSString stringWithUTF8String:(char *) startedStr]] : nil );
-                        xmlFree( startedStr );
-                }
-        }
-
-        return self;
-}
-
-+ (id) sessionWithNode:(xmlNode *) node andTranscript:(JVChatTranscript *) transcript {
-        return [[[self alloc] initWithNode:node andTranscript:transcript] autorelease];
-}
-
-- (void) dealloc {
-        [_startDate release];

trunk/Models/JVChatTranscript.h

@@ -57 +57 @@
-- (JVChatMessage *) messageAtIndex:(unsigned long) index;
-- (JVChatMessage *) messageWithIdentifier:(NSString *) identifier;
-- (NSArray *) messagesInEnvelopeWithMessage:(JVChatMessage *) message;
-- (JVChatMessage *) lastMessage;
-
@@ -73 +72 @@
-
-- (JVChatSession *) startNewSession;
-WithStartDate:(NSDate *) startDate
+:(JVChatSession *) session
-
-- (NSArray *) events;

trunk/Models/JVChatTranscript.m

@@ -32 +32 @@
-
-@interface JVChatSession (JVChatSessionPrivate)
-
-
-
+
+
-@end
-
@@ -306 +305 @@
-                        } else if( node && node -> type == XML_ELEMENT_NODE && ! strncmp( "session", (char *) node -> name, 7 ) ) {
-                                if( NSLocationInRange( i, range ) ) {
-JVChatSession session
+[JVChatSession allocWithZone:nil] _init
-                                        if( session ) [ret addObject:session];
+                                        [session release];
-                                }
-
@@ -342 +342 @@
-                                } while( subNode && ( subNode = subNode -> prev ) );
-                        } else if( node && node -> type == XML_ELEMENT_NODE && ! strncmp( "session", (char *) node -> name, 7 ) ) {
-JVChatSession sessionWithNode:node andTranscript:self
+[[JVChatSession allocWithZone:nil] _initWithNode:node andTranscript:self] autorelease
-                        } else if( node && node -> type == XML_ELEMENT_NODE && ! strncmp( "event", (char *) node -> name, 5 ) ) {
-                                return [[[JVChatEvent allocWithZone:nil] _initWithNode:node andTranscript:self] autorelease];
@@ -365 +365 @@
-                        if( [element isKindOfClass:[JVChatMessage class]] ) newElement = [self appendMessage:element];
-                        else if( [element isKindOfClass:[JVChatEvent class]] ) newElement = [self appendEvent:element];
-WithStartDate:[element startDate]
+:element
-                        if( newElement ) [ret addObject:newElement];
-                }
@@ -478 +478 @@
-}
-
-- (NSArray *) messagesInEnvelopeWithMessage:(JVChatMessage *) message {
-        NSParameterAssert( message != nil );
-        NSParameterAssert( [message node] != NULL );
-
-        @synchronized( self ) {
-                xmlNode *envelope = ((xmlNode *)[message node]) -> parent;
-                xmlNode *node = envelope -> children;
-                NSMutableArray *results = [NSMutableArray allocWithZone:nil];
-
-                do {
-                        if( node && node -> type == XML_ELEMENT_NODE && ! strncmp( "message", (char *) node -> name, 7 ) ) {
-                                JVChatMessage *msg = [[JVChatMessage allocWithZone:nil] _initWithNode:node andTranscript:self];
-                                if( msg ) [results addObject:msg];
-                                [msg release];
-                        }
-                } while( node && ( node = node -> next ) );
-
-                return [results autorelease];
-        }
-
-        return nil;
-}
-
-- (JVChatMessage *) lastMessage {
-        @synchronized( self ) {
@@ -687 +664 @@
-                        if( node && node -> type == XML_ELEMENT_NODE && ! strncmp( "session", (char *) node -> name, 7 ) ) {
-                                if( NSLocationInRange( i, range ) ) {
-JVChatSession session
+[JVChatSession allocWithZone:nil] _init
-                                        if( session ) [ret addObject:session];
+                                        [session release];
-                                }
-
@@ -709 +687 @@
-                do {
-                        if( node && node -> type == XML_ELEMENT_NODE && ! strncmp( "session", (char *) node -> name, 7 ) )
-JVChatSession sessionWithNode:node andTranscript:self
+[[JVChatSession allocWithZone:nil] _initWithNode:node andTranscript:self] autorelease
-                } while( node && ( node = node -> prev ) );
-        }
@@ -719 +697 @@
-
-- (JVChatSession *) startNewSession {
-
-
-
-
+
+
+
+
+
-        xmlNodePtr sessionNode = xmlNewNode( NULL, (xmlChar *) "session" );
-startDate
+[session startDate]
-        xmlAddChild( xmlDocGetRootElement( _xmlLog ), sessionNode );
+
-        [self _enforceElementLimit];
-        [self _incrementalWriteToLog:sessionNode continuation:NO];
-
+
+
-}
-
@@ -1274 +1255 @@
-#pragma mark -
-
+@implementation JVChatSession (JVChatSessionChatTranscriptPrivate)
+- (id) _initWithNode:(xmlNode *) node andTranscript:(JVChatTranscript *) transcript {
+        if( ( self = [self init] ) ) {
+                _node = node;
+                _transcript = transcript; // weak reference
+
+                if( ! _node || node -> type != XML_ELEMENT_NODE ) {
+                        [self release];
+                        return nil;
+                }
+
+                @synchronized( _transcript ) {
+                        xmlChar *startedStr = xmlGetProp( (xmlNode *) _node, (xmlChar *) "started" );
+                        _startDate = ( startedStr ? [[NSDate allocWithZone:[self zone]] initWithString:[NSString stringWithUTF8String:(char *) startedStr]] : nil );
+                        xmlFree( startedStr );
+                }
+        }
+
+        return self;
+}
+@end
+
+#pragma mark -
+
-@implementation JVChatMessage (JVChatMessageChatTranscriptPrivate)
-- (id) _initWithNode:(xmlNode *) node andTranscript:(JVChatTranscript *) transcript {
@@ -1320 +1325 @@
-                xmlFree( prop );
-
-
+
+
+
-                _ignoreStatus = ( ( prop && ! strcmp( (char *) prop, "yes" ) ) ? JVUserIgnored : _ignoreStatus );
-                xmlFree( prop );
-
-((xmlNode *) _node) -> parent
+envelope
-                [_source autorelease];
-                _source = ( prop ? [[NSURL allocWithZone:[self zone]] initWithString:[NSString stringWithUTF8String:(char *) prop]] : nil );
-                xmlFree( prop );
+
+                xmlNode *node = envelope -> children;
+
+                do {
+                        if( node && node -> type == XML_ELEMENT_NODE && ! strncmp( "message", (char *) node -> name, 7 ) ) {
+                                if( node == _node ) break;
+                                _consecutiveOffset++;
+                        }
+                } while( node && ( node = node -> next ) );
-        }
-
@@ -1342 +1358 @@
-                        if( subNode -> type == XML_ELEMENT_NODE && ! strncmp( "sender", (char *) subNode -> name, 6 ) ) {
-                                xmlChar *prop = xmlNodeGetContent( subNode );
-[_senderName autorelease]
+id old = _senderName
-                                if( prop ) _senderName = [[NSString allocWithZone:[self zone]] initWithUTF8String:(char *) prop];
-                                else _senderName = nil;
+                                [old release];
-                                xmlFree( prop );
-
-                                prop = xmlGetProp( subNode, (xmlChar *) "nickname" );
-[_senderNickname autorelease]
+old = _senderNickname
-                                if( prop ) _senderNickname = [[NSString allocWithZone:[self zone]] initWithUTF8String:(char *) prop];
-                                else _senderNickname = nil;
+                                [old release];
-                                xmlFree( prop );
-
-                                prop = xmlGetProp( subNode, (xmlChar *) "identifier" );
-[_senderIdentifier autorelease]