gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-04-23 23:48:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

new GSWDatabase Framework

Browse source 
Monitoring additions



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@30164 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Dave Wetzel 2010-04-15 06:12:00 +00:00
parent 89e2a50334
commit 5cbad51d63
9 changed files with 29 additions and 3183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2010-04-15 David Wetzel <dave@turbocat.de>
new GSWDatabase Framework for EOF/GDL based applications
not tested yet!
GSWeb.framework:
* Moved WODisplayGroup.? to GSWDatabase
changed: GNUmakefile GSWeb.h GSWWOCompatibility.h
* GSWApplication: removed EOF
* small cleanups
* GSWUtils.m EONull -> NSNull
* GSWApplication+Defaults.m, GSWPrivate.h additions for Monitoring
2010-04-14 David Wetzel <dave@turbocat.de>
Apache2/GNUmakefile.in
* changed flags, clean now

7
GSWeb.framework/GNUmakefile
View file

@ -107,7 +107,6 @@ GSWAssociation.m \
GSWComponent.m \
GSWContext.m \
GSWMultiKeyDictionary.m \
GSWDisplayGroup.m \
GSWDynamicElement.m \
GSWDynamicGroup.m \
GSWElement.m \
@ -194,6 +193,7 @@ GSWRecording.m \
GSWInputStreamData.m \
GSWActionURL.m \
GSWWorkerThread.m \
NSObject+XML.m
#For next Version:
#GSWAdminAction.m \
@ -237,7 +237,6 @@ GSWAction.h \
GSWDirectAction.h \
GSWActionRequestHandler.h \
GSWDirectActionRequestHandler.h \
GSWDisplayGroup.h \
GSWDynamicElement.h \
GSWDynamicGroup.h \
GSWDynamicURLString.h \
@ -323,6 +322,9 @@ GSWRecording.h \
GSWInputStreamData.h \
GSWActionURL.h \
GSWDefines.h \
GSWHTTPIO.h \
GSWPrivate.h \
NSObject+XML.h
#For next Version:
#GSWAdminAction.h \
@ -341,7 +343,6 @@ WO_HEADER_FILES = \
WOContext.h \
WOCookie.h \
WODirectAction.h \
WODisplayGroup.h \
WODynamicElement.h \
WOElement.h \
WOMailDelivery.h \

8
GSWeb.framework/GSWApplication+Defaults.m
View file

@ -1256,12 +1256,20 @@ static int _dflt_lifebeatDestinationPort = 0;
};
//--------------------------------------------------------------------
// dw 20 jan 2010 this should be
// -(void) _setLifebeatDestinationPort:(int) port
+(void)setLifebeatDestinationPort:(int)port
{
_dflt_lifebeatDestinationPort = port;
_dflt_init_lifebeatDestinationPort = YES;
};
+(void)_setLifebeatDestinationPort:(int)port
{
_dflt_lifebeatDestinationPort = port;
_dflt_init_lifebeatDestinationPort = YES;
};
//--------------------------------------------------------------------
static BOOL _dflt_init_lifebeatInterval = NO;
static NSTimeInterval _dflt_lifebeatInterval = 0.0;

282
GSWeb.framework/GSWDisplayGroup.h
View file

@ -1,282 +0,0 @@
/** GSWDisplayGroup.h - <title>GSWeb: Class GSWDisplayGroup</title>
Copyright (C) 1999-2004 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
$Revision$
$Date$
This file is part of the GNUstep Web Library.
<license>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
</license>
**/
// $Id$
#ifndef _GSWDisplayGroup_h__
#define _GSWDisplayGroup_h__
#ifdef TCSDB
#include <TCSimpleDB/TCSimpleDB.h>
#include <TCSimpleDB/EODefines.h>
#else
#include <EOControl/EOQualifier.h>
#include <EOControl/EOEditingContext.h>
#include <EOControl/EODataSource.h>
#include <EOControl/EODetailDataSource.h>
#include <EOControl/EOKeyValueArchiver.h>
#include <EOControl/EONull.h>
#include <EOControl/EODeprecated.h>
#include <EOAccess/EODatabaseDataSource.h>
#endif
@interface GSWDisplayGroup : NSObject <NSCoding>
{
id _delegate;
/*
objects (array) supplied by the EODataSource
EOQualifier and EOSortOrderings to filter the objects for display
Array of selection indexes
*/
EODataSource* _dataSource;
NSMutableArray* _allObjects;
NSMutableArray* _displayedObjects;
NSMutableArray* _selectedObjects;
NSArray* _selection;
NSArray* _sortOrdering;
EOQualifier* _qualifier; /** qualifier used to in memory filter after fetch **/
EOQualifier* _auxiliaryQueryQualifier; /** qualifier used when qualifying dataSource (added to query qualifiers) **/
NSArray* _localKeys;
NSDictionary* _insertedObjectDefaultValues;
NSMutableArray* _savedAllObjects;
NSMutableDictionary* _queryMatch;
NSMutableDictionary* _queryNotMatch;
NSMutableDictionary* _queryMin;
NSMutableDictionary* _queryMinMatch;
NSMutableDictionary* _queryMax;
NSMutableDictionary* _queryMaxMatch;
NSMutableDictionary* _queryOperator;
NSMutableDictionary* _queryKeyValueQualifierClassName;
NSString* _defaultStringMatchOperator;
NSString* _defaultStringMatchFormat;
NSMutableDictionary*_queryBindings;
int _updatedObjectIndex;
unsigned _numberOfObjectsPerBatch;
unsigned _batchIndex;
struct {
unsigned int selectFirstObject:1;
unsigned int autoFetch:1;
unsigned int validateImmediately:1;
unsigned int fetchAll:1;
unsigned int isCustomDataSourceClass:1;
unsigned int isInitialized:1;
unsigned int didChangeContents:1;
unsigned int didChangeSelection:1;
unsigned int haveFetched:1;
unsigned int _reserved:23;
} _flags;
struct {
unsigned int didChangeDataSource:1;
unsigned int displayArrayForObjects:1;
unsigned int selectsFirstObjectAfterFetch:1;
unsigned int shouldChangeSelection:1;
unsigned int didChangeSelection:1;
unsigned int didChangeSelectedObjects:1;
unsigned int createObjectFailed:1;
unsigned int shouldInsertObject:1;
unsigned int didInsertObject:1;
unsigned int shouldFetchObjects:1;
unsigned int didFetchObjects:1;
unsigned int shouldDeleteObject:1;
unsigned int didDeleteObject:1;
unsigned int didSetValueForObject:1;
unsigned int shouldRedisplay:1;
unsigned int shouldRefetchObjects:1;
unsigned int _reserved:16;
} _delegateRespondsTo;
};
+ (GSWDisplayGroup* )displayGroup;
- (id)undoManager;
- (NSArray *)allObjects;
- (NSArray *)allQualifierOperators;
- (unsigned)batchCount;
- (BOOL)buildsQualifierFromInput;
- (BOOL)clearSelection;
- (unsigned)currentBatchIndex;
- (EODataSource *)dataSource;
- (NSString *)defaultStringMatchFormat;
- (NSString *)defaultStringMatchOperator;
+ (NSString*)globalDefaultStringMatchOperator;
+ (void)setGlobalDefaultStringMatchOperator:(NSString *)operatorString;
+ (NSString *)globalDefaultStringMatchFormat;
+ (void)setGlobalDefaultStringMatchFormat:(NSString *)format;
+ (BOOL)globalDefaultForValidatesChangesImmediately;
+ (void)setGlobalDefaultForValidatesChangesImmediately:(BOOL)flag;
- (id)delegate;
- (id)delete;
- (BOOL)deleteObjectAtIndex:(unsigned)index;
- (BOOL)deleteSelection;
- (NSString *)detailKey;
- (id)displayBatchContainingSelectedObject;
- (NSArray *)displayedObjects;
- (NSArray *)allDisplayedObjects;
- (id)displayFirstBatch;
- (id)displayNextBatch;
- (id)displayPreviousBatch;
- (id)displayLastBatch;
- (BOOL)canDisplayFirstBatch;
- (BOOL)canDisplayNextBatch;
- (BOOL)canDisplayPreviousBatch;
- (BOOL)canDisplayLastBatch;
- (BOOL)endEditing;
- (id)executeQuery;
- (id)fetch;
- (BOOL)fetchesOnLoad;
- (BOOL)hasDetailDataSource;
- (BOOL)hasMultipleBatches;
- (unsigned)indexOfFirstDisplayedObject;
- (unsigned)indexOfLastDisplayedObject;
- (id)init;
- (id)initWithKeyValueUnarchiver:(EOKeyValueUnarchiver*)unarchiver;
- (void)awakeFromKeyValueUnarchiver:(EOKeyValueUnarchiver*)object;
- (NSMutableDictionary *)inputObjectForQualifier;
- (BOOL)inQueryMode;
-(void) editingContext:(EOEditingContext*)editingContext
presentErrorMessage:(NSString*)msg;
- (id)insert;
- (id)insertAfterLastObject;
- (NSDictionary *)insertedObjectDefaultValues;
- (void)insertObject:object
atIndex:(unsigned)index;
- (id)insertObjectAtIndex:(unsigned)index;
- (EOQualifier *)lastQualifierFromInputValues;
- (NSArray *)localKeys;
- (id)masterObject;
- (unsigned)numberOfObjectsPerBatch;
- (EOQualifier *)qualifier;
- (EOQualifier *)_auxiliaryQueryQualifier;
- (EOQualifier *)qualifierFromInputValues;
- (EOQualifier *)qualifierFromQueryValues;
- (void)qualifyDataSource;
- (void)qualifyDisplayGroup;
- (NSMutableDictionary*)queryBindings;
- (NSMutableDictionary*)queryMatch;
- (NSMutableDictionary*)queryNotMatch;
- (NSMutableDictionary*)queryMax;
- (NSMutableDictionary*)queryMaxMatch;
- (NSMutableDictionary*)queryMin;
- (NSMutableDictionary*)queryMinMatch;
- (NSMutableDictionary*)queryOperator;
- (NSMutableDictionary*)queryKeyValueQualifierClassName;
- (void)redisplay;
- (NSArray *)relationalQualifierOperators;
- (NSMutableDictionary *)secondObjectForQualifier;
- (id)selectedObject;
- (void)setSelectedObject:(id)object;
- (void)setSelectedObjects:(NSArray *)objects;
- (NSArray *)selectedObjects;
- (NSArray *)selectionIndexes;
- (id)selectFirst;
- (id)selectNext;
- (BOOL)selectObject:(id)object;
- (BOOL)selectObjectsIdenticalTo:(NSArray *)objects;
- (BOOL)selectObjectsIdenticalTo:(NSArray *)objects
selectFirstOnNoMatch:(BOOL)flag;
- (id)selectPrevious;
- (BOOL)selectsFirstObjectAfterFetch;
- (void)setBuildsQualifierFromInput:(BOOL)flag;
- (void)setCurrentBatchIndex:(unsigned)index;
- (void)setDataSource:(EODataSource *)dataSource;
- (void)setDefaultStringMatchFormat:(NSString *)format;
- (void)setDefaultStringMatchOperator:(NSString *)operator;
- (void)setDelegate:(id)object;
- (void)setDetailKey:(NSString *)detailKey;
- (void)setFetchesOnLoad:(BOOL)flag;
- (void)setInQueryMode:(BOOL)flag;
- (void)setInsertedObjectDefaultValues:(NSDictionary *)defaultValues;
- (void)setQueryOperator:(NSDictionary*)qo;
- (void)addQueryOperator:(NSString*)value
forKey:(NSString*)operatorKey;
- (void)setQueryKeyValueQualifierClassName:(NSDictionary*)qo;
- (void)setLocalKeys:(NSArray *)keys;
- (void)setMasterObject:(id)masterObject;
- (void)setNumberOfObjectsPerBatch:(unsigned)count;
- (void)setObjectArray:(NSArray *)objects;
- (void)setQualifier:(EOQualifier *)qualifier;
- (void)setAuxiliaryQueryQualifier:(EOQualifier *)qualifier;
- (BOOL)setSelectionIndexes:(NSArray *)selection;
- (void)setSelectsFirstObjectAfterFetch:(BOOL)flag;
- (void)setSortOrderings:(NSArray *)orderings;
- (void)setValidatesChangesImmediately:(BOOL)flag;
- (NSArray *)sortOrderings;
- (void)updateDisplayedObjects;
- (BOOL)validatesChangesImmediately;
@end
// By Delegate
@interface NSObject (GSWDisplayGroupDelegation)
-(void)displayGroup:(GSWDisplayGroup*)displayGroup
createObjectFailedForDataSource:(id)dataSource;
-(void)displayGroup:(GSWDisplayGroup*)displayGroup
didDeleteObject:(id)object;
-(void)displayGroup:(GSWDisplayGroup*)displayGroup
didFetchObjects:(NSArray*)objects;
-(void)displayGroup:(GSWDisplayGroup*)displayGroup
didInsertObject:(id)object;
-(void)displayGroup:(GSWDisplayGroup*)displayGroup
didSetValue:(id)value
forObject:(id)object
key:(NSString*)key;
-(NSArray*)displayGroup:(GSWDisplayGroup*)displayGroup
displayArrayForObjects:(NSArray*)objects;
-(BOOL)displayGroup:(GSWDisplayGroup*)displayGroup
shouldChangeSelectionToIndexes:(NSArray*)newIndexes;
-(BOOL)displayGroup:(GSWDisplayGroup*)displayGroup
shouldInsertObject:object
atIndex:(unsigned)index;
-(BOOL)displayGroup:(GSWDisplayGroup*)displayGroup
shouldDeleteObject:object;
-(BOOL)displayGroup:(GSWDisplayGroup*)displayGroup
shouldRedisplayForEditingContextChangeNotification:(NSNotification*)notification;
-(BOOL)displayGroup:(GSWDisplayGroup*)displayGroup
shouldRefetchForInvalidatedAllObjectsNotification:(NSNotification*)notification;
-(void)displayGroupDidChangeDataSource:(GSWDisplayGroup*)displayGroup;
-(void)displayGroupDidChangeSelectedObjects:(GSWDisplayGroup*)displayGroup;
-(void)displayGroupDidChangeSelection:(GSWDisplayGroup*)displayGroup;
-(BOOL)displayGroupShouldFetch:(GSWDisplayGroup*)displayGroup;
@end
#endif //_GSWDisplayGroup_h__

2895
GSWeb.framework/GSWDisplayGroup.m
View file

File diff suppressed because it is too large Load diff

4
GSWeb.framework/GSWPrivate.h
View file

@ -89,6 +89,10 @@ static inline void GSWeb_appendStringWithImpPtr(NSMutableString* object,IMP* imp
-(GSWComponentDefinition*) _componentDefinitionWithName:(NSString*)aName
languages:(NSArray*)languages;
/* defaults */
+(void)_setLifebeatDestinationPort:(int)port;
@end
@interface GSWAssociation (PrivateDeclarations)

2
GSWeb.framework/GSWUtils.m
View file

@ -91,7 +91,7 @@ void GSWInitializeAllMisc()
// Strings things
ASSIGN(nsStringClass,[NSString class]);
ASSIGN(nsMutableStringClass,[NSMutableString class]);
ASSIGN(eoNullClass,[EONull class]);
ASSIGN(eoNullClass,[NSNull class]);
stringWithStringSEL = @selector(stringWithString:);
NSCAssert(stringWithStringSEL,@"No SEL for stringWithString:");

1
GSWeb.framework/GSWWOCompatibility.h
View file

@ -94,6 +94,7 @@
#define GSWJpegImageInfo WOJpegImageInfo
#define GSWGifImageInfo WOGifImageInfo
#define GSWPngImageInfo WOPngImageInfo
#define WOHttpIO GSWHTTPIO
/* Dynamic Elements */

2
GSWeb.framework/GSWeb.h
View file

@ -87,7 +87,6 @@
@class GSWAssociation;
@class GSWComponent;
@class GSWContext;
@class GSWDisplayGroup;
@class GSWElement;
@class GSWDynamicElement;
@class GSWMessage;
@ -170,7 +169,6 @@
#include "GSWApplication.h"
#include "GSWAssociation.h"
#include "GSWContext.h"
#include "GSWDisplayGroup.h"
#include "GSWElement.h"
#include "GSWComponent.h"
#include "GSWHTMLStaticElement.h"