From: helge Date: Thu, 21 Oct 2004 11:07:28 +0000 (+0000) Subject: Id fixes X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4af6021bf7f8e34401890a9342ab73a06aa48060;p=sope Id fixes git-svn-id: http://svn.opengroupware.org/SOPE/trunk@289 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.h b/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.h index 031e866a..b6747c8c 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.h +++ b/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.h @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2002-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. OGo is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -18,10 +18,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ -#ifndef __codeon_SaxDAVHandler_H__ -#define __codeon_SaxDAVHandler_H__ +#ifndef __NGObjWeb_SaxDAVHandler_H__ +#define __NGObjWeb_SaxDAVHandler_H__ #include @@ -133,4 +132,4 @@ @end -#endif /* __codeon_SaxDAVHandler_H__ */ +#endif /* __NGObjWeb_SaxDAVHandler_H__ */ diff --git a/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m b/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m index f40b8adb..0c85952d 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m +++ b/sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2002-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. OGo is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include "SaxDAVHandler.h" #include "EOFetchSpecification+SoDAV.h" @@ -70,6 +69,7 @@ static BOOL heavyLog = NO; /* cleanup */ - (void)parseReset { + /* only reset non-result items */ if (heavyLog) [self logWithFormat:@"reset parser state"]; self->propValueNesting = 0; self->in.PropFind = 0; @@ -109,6 +109,7 @@ static BOOL heavyLog = NO; [self->lastWherePropName release]; self->lastWherePropName = nil; } - (void)reset { + /* reset everything, including result items */ if (heavyLog) [self logWithFormat:@"reset"]; [self parseReset]; self->findAllProps = NO; diff --git a/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.h b/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.h index 6bd389e3..053ec4f4 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.h +++ b/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2004 SKYRIX Software AG + Copyright (C) 2002-2004 SKYRIX Software AG This file is part of OpenGroupware.org. @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #ifndef __WebDAV_SoDAVSQLParser_H__ #define __WebDAV_SoDAVSQLParser_H__ diff --git a/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m b/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m index abc4b548..9518b97b 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m +++ b/sope-appserver/NGObjWeb/WebDAV/SoDAVSQLParser.m @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2004 SKYRIX Software AG + Copyright (C) 2002-2004 SKYRIX Software AG This file is part of OpenGroupware.org. @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include "SoDAVSQLParser.h" #include diff --git a/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.h b/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.h index 00d25c55..1bb94ed0 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.h +++ b/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.h @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2002-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. OGo is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #ifndef __NGObjWeb_SoSubscriptionManager_H__ #define __NGObjWeb_SoSubscriptionManager_H__ diff --git a/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.m b/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.m index 9534b20e..a6ab89e6 100644 --- a/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.m +++ b/sope-appserver/NGObjWeb/WebDAV/SoSubscriptionManager.m @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2002-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. OGo is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include "SoSubscriptionManager.h" #include "SoSubscription.h"