|
From: Geisschaes <gei...@us...> - 2005-06-21 17:46:03
|
Update of /cvsroot/macattrick/macattrick In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29522 Modified Files: Arena.m Club.m Economy.m League.m PlayerList.m Team.m Training.m User.m World.m Log Message: if xml parsing failes, the init methods return nil now. should be more stable if the download of the files has not terminated correctly. but actually I was not able to reproduce this error. Index: Arena.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Arena.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Arena.m 28 Mar 2005 14:58:39 -0000 1.4 --- Arena.m 21 Jun 2005 17:44:49 -0000 1.5 *************** *** 41,52 **** - (Arena*) initFromXML: (NSURL*) url { - BOOL success; self = [super init]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; ! currentCapacity = FALSE; return self; } --- 41,59 ---- - (Arena*) initFromXML: (NSURL*) url { self = [super init]; ! if(self) { ! BOOL success; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! if(parser) { ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; ! currentCapacity = FALSE; ! if(!success) { ! return nil; ! } ! } ! } return self; } Index: League.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/League.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** League.m 4 Oct 2004 20:27:32 -0000 1.4 --- League.m 21 Jun 2005 17:44:50 -0000 1.5 *************** *** 50,61 **** - (League*) initFromXML: (NSURL*) url { - BOOL success; self = [super init]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! [parser setDelegate:self]; ! myTeam = FALSE; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; return self; } --- 50,68 ---- - (League*) initFromXML: (NSURL*) url { self = [super init]; ! if(self) { ! BOOL success; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! if(parser) { ! [parser setDelegate:self]; ! myTeam = FALSE; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; ! if(!success) { ! return nil; ! } ! } ! } return self; } Index: Club.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Club.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Club.m 4 Jan 2005 18:23:28 -0000 1.2 --- Club.m 21 Jun 2005 17:44:50 -0000 1.3 *************** *** 47,58 **** - (Club*) initFromXML: (NSURL*) url { - BOOL success; - //[self setYouthLevel:1]; self = [super init]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; return self; } --- 47,66 ---- - (Club*) initFromXML: (NSURL*) url { self = [super init]; ! if(self) { ! BOOL success; ! //[self setYouthLevel:1]; ! self = [super init]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! if(parser) { ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; ! if(!success) { ! return nil; ! } ! } ! } return self; } Index: Economy.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Economy.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Economy.m 26 Dec 2004 14:59:33 -0000 1.7 --- Economy.m 21 Jun 2005 17:44:50 -0000 1.8 *************** *** 75,84 **** BOOL success; self = [super init]; ! worldDetailsParsing = NO; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; return self; } --- 75,91 ---- BOOL success; self = [super init]; ! if(self) { ! worldDetailsParsing = NO; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! if(parser) { ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; ! if(!success) { ! return nil; ! } ! } ! } return self; } *************** *** 88,100 **** NSURL *url = [[NSURL alloc] initFileURLWithPath: [Properties economyFile]]; self = [[Economy alloc] initFromXML: url]; ! NSURL *worldUrl = [[NSURL alloc] initFileURLWithPath: [Properties worldDetailsFile]]; ! worldDetailsParsing = YES; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: worldUrl]; ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [url release]; ! [worldUrl release]; ! [parser release]; return self; } --- 95,114 ---- NSURL *url = [[NSURL alloc] initFileURLWithPath: [Properties economyFile]]; self = [[Economy alloc] initFromXML: url]; ! if(self) { ! NSURL *worldUrl = [[NSURL alloc] initFileURLWithPath: [Properties worldDetailsFile]]; ! worldDetailsParsing = YES; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: worldUrl]; ! if(parser) { ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; ! [url release]; ! [worldUrl release]; ! if(!success) { ! return nil; ! } ! } ! } return self; } Index: World.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/World.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** World.m 29 May 2005 13:17:03 -0000 1.3 --- World.m 21 Jun 2005 17:44:50 -0000 1.4 *************** *** 54,62 **** countries = [[NSMutableDictionary alloc]init]; NSURL *url = [[NSURL alloc] initFileURLWithPath: [Properties worldDetailsFile]]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; } return self; --- 54,67 ---- countries = [[NSMutableDictionary alloc]init]; NSURL *url = [[NSURL alloc] initFileURLWithPath: [Properties worldDetailsFile]]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! if(parser) { ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; ! if(!success) { ! return nil; ! } ! } } return self; Index: PlayerList.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/PlayerList.m,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PlayerList.m 1 Jun 2005 18:13:35 -0000 1.8 --- PlayerList.m 21 Jun 2005 17:44:50 -0000 1.9 *************** *** 43,53 **** BOOL success; self = [super init]; ! playerList = [[NSMutableArray alloc] init]; ! formerDates = [[NSMutableArray alloc] init]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; return self; } --- 43,60 ---- BOOL success; self = [super init]; ! if(self) { ! playerList = [[NSMutableArray alloc] init]; ! formerDates = [[NSMutableArray alloc] init]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! if(parser) { ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; ! if(!success) { ! return nil; ! } ! } ! } return self; } Index: Training.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Training.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Training.m 18 Jan 2005 21:05:47 -0000 1.4 --- Training.m 21 Jun 2005 17:44:50 -0000 1.5 *************** *** 45,55 **** - (Training*) initFromXML: (NSURL*) url { - BOOL success; self = [super init]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; return self; } --- 45,62 ---- - (Training*) initFromXML: (NSURL*) url { self = [super init]; ! if(self) { ! BOOL success; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! if(parser) { ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; ! if(!success) { ! return nil; ! } ! } ! } return self; } Index: User.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/User.m,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** User.m 28 Nov 2004 14:07:02 -0000 1.3 --- User.m 21 Jun 2005 17:44:50 -0000 1.4 *************** *** 42,52 **** - (User*) initFromXML: (NSURL*) url { - BOOL success; self = [super init]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; return self; } --- 42,60 ---- - (User*) initFromXML: (NSURL*) url { self = [super init]; ! if(self) { ! BOOL success; ! self = [super init]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! if(parser) { ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; ! if(!success) { ! return nil; ! } ! } ! } return self; } Index: Team.m =================================================================== RCS file: /cvsroot/macattrick/macattrick/Team.m,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Team.m 30 May 2005 19:59:59 -0000 1.23 --- Team.m 21 Jun 2005 17:44:50 -0000 1.24 *************** *** 48,70 **** - (Team*) init { self = [super init]; ! BOOL success; ! [self retain]; ! [currentTeam release]; ! currentTeam = self; ! user = [[User alloc] init]; ! NSURL *url = [[NSURL alloc] initFileURLWithPath: [Properties teamDetailsFile]]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! playerList = [[PlayerList alloc] init]; ! [playerList loadFormerPlayerStates]; ! arena = [[Arena alloc] init]; ! league = [[League alloc] init]; ! economy = [[Economy alloc] init]; ! club = [[Club alloc] init]; ! training = [[Training alloc] init]; ! [parser release]; ! [url release]; return self; } --- 48,77 ---- - (Team*) init { self = [super init]; ! if(self) { ! BOOL success; ! [self retain]; ! [currentTeam release]; ! currentTeam = self; ! user = [[User alloc] init]; ! NSURL *url = [[NSURL alloc] initFileURLWithPath: [Properties teamDetailsFile]]; ! NSXMLParser *parser = [[NSXMLParser alloc] initWithContentsOfURL: url]; ! if(parser) { ! [parser setDelegate:self]; ! [parser setShouldResolveExternalEntities:YES]; ! success = [parser parse]; ! [parser release]; ! if(!success) { ! return nil; ! } ! playerList = [[PlayerList alloc] init]; ! [playerList loadFormerPlayerStates]; ! arena = [[Arena alloc] init]; ! league = [[League alloc] init]; ! economy = [[Economy alloc] init]; ! club = [[Club alloc] init]; ! training = [[Training alloc] init]; ! } ! [url release]; ! } return self; } |