libs-gsweb/GSWeb.framework/NSString+Trimming.m
Manuel Guesdon e016ce3909 2003-01-19 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb/GSWApplication.m
		o removed unused +initialize
	* GSWeb/GSWDefaultAdaptorThread.m:
		o more information on "bad request first line" exception
	* GSWeb/GSWHTMLDynamicElement.m
		o in -initWithName:attributeAssociations:contentElements:
			add "" to association values because XML parser romove them.
		o added -computeActionStringWithActionClassAssociation:
				directActionNameAssociation:inContext:
		o added -computeQueryDictionaryWithActionClassAssociation:
				directActionNameAssociation:queryDictionaryAssociation:
				otherQueryAssociations:inContext:
	* GSWeb/GSWResponse.m:
		o don't append debugcomment if !GSDebugSet(@"debugComments")
		o fixed bug in appendContentString: in NSAssert3 params
		o adedd -_appendTagAttribute:value:escapingHTMLAttributeValue:
		o added GSWResponse (GSWResponseRedirected)
	* GSWeb/GSWResponse.h:
		o added -forceFinalizeInContext
		o added GSWResponse (GSWResponseRedirected)
	* GSWeb/GSWTemplateParserXML.m:
		o only include comments if [GSWApplication includeCommentsInResponses]
	* GSWExtensions.framework/GSWLongResponsePage.m:
		o in -cancel call cancelPageForStatus: instead of cancelPage
		o declare private interface
	* GSWeb/GSWComponent.m:
		o don't output end of component commend if !DEBUG && !GSDebugSet(@"gswcomponents")
		o fixes in _generateResponseInContext:
	* GSWeb/GSWContext.[hm]:
		o added _userInfo to enable developper context specific
			temporary information storage
		o added -userInfo
		o added -_generateRelativeURLs
		o make -_generateCompleteURLs returning previous state.
		o added -directActionURLForActionNamed:queryDictionary:isSecure:
		o added -_directActionURLForActionNamed:queryDictionary:isSecure:url:
		o added -componentActionURLIsSecure:
		o modified -session
		o modified -_takeAwakeComponent: to not add already added component
		o implemented _takeAwakeComponentsFromArray;
		o fixed -_incrementContextID
		o added _session
		o fixes in -copyWithZone to keep mutable objects mutables.
		o added _requestContextID
		o added -_setRequestContextID: and -_requestContextID;
	* GSWeb/GSWHyperlink.[hm]:
		o added _secure
		o added binding validation tests
		o fixes in -appendToResponse:inContext:
		o handle correctly otherQueryAssociations (bindings starting with '?')
	* GSWeb/GSWConstants.[hm]:
		o added cidStore__Key for GSWHTMLURLValuedElement
		o added cidKey__Key for GSWHTMLURLValuedElement
	* GSWeb/GSWImage.[hm]:
		o added _width, _height
	* GSWeb/GSWHTMLURLValuedElement.[hm]
		o implemented -_appendCGIActionURLToResponse:inContext:
		o implemented -computeActionStringInContext:
		o implemented -computeQueryDictionaryInContext:
		o handle otherQueryAssociations (bindings starting with '?')
		o handle cidStore and cidKey
	* GSWeb/GSWRequest.[hm]:
		o added _context
		o changes for compilation warnings
		o added -sessionIDFromValuesOrCookieByLookingForCookieFirst:
		o added +_lookForIDsInCookiesFirst
		o rewrite form/uri/cookie values retrieving (for sessionID,...)
		o new use GSMimeParser for formData parsing
	* Doc/antlr.txt added
	* GSWeb/GSWPageDefParser.[hm] regenerated to handle (bindings starting with '?')
	* GSWeb/GSWPageDefParserTokenTypes.txt regenerated to handle (bindings starting with '?')
	* GSWeb/GSWPageDefParserTokenTypes.h regenerated to handle (bindings starting with '?')
	* GSWeb/GSWPageDefLexer.[hm]  regenerated to handle (bindings starting with '?')
	* GSWeb/GSWUtils.[hm]:
		o added -extractObjectsForKeysWithPrefix:removePrefix:
		o fixed bug in HexStringToData
		o fixed bug in NSDictionary +dictionaryWithArray:onSelector:withObject:
	* GSWeb/GSWForm.[hm]
		o handle otherQueryAssociations (bindings starting with '?')
		o implemented -computeQueryDictionaryInContext:
		o implemented/fixed -_appendHiddenFieldsToResponse:inContext:
		o implemented -_appendCGIActionToResponse:inContext:
		o fix -appendGSWebObjectsAssociationsToResponse:inContext: for directAction
		o added -computeActionStringInContext:
		o fixed -invokeActionForRequest:inContext: to invoke action when to element is invoked
	* GSWeb/GSWDirectAction.m:
		o fixed -_initializeRequestSessionIDInContext:
		o added -sessionIDForRequest:
	* GSWeb/NSString+HTML.[hm]:
		o added -dictionaryWithSep1:withSep2:withOptionUnescape:forceArray:
	* GSWeb/NSString+Trimming.m:
		o fix in +stringUniqueIdWithLength: initialize random generator
	* GSWeb/GSWSession.[hm]:
		o added createSessionID which create better sessionID
			(uniq in time and larger to give better security)
		o fixes in _saveCurrentPage
	* GSWeb/GSWBundle.m:
		o fix compiler warning


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@15630 72102866-910b-0410-8b05-ffd578937521
2003-01-19 15:33:07 +00:00

312 lines
8.7 KiB
Objective-C

/** NSString+Trimming.m - <title>GSWeb: Class NSString with Trimming </title>
Copyright (C) 1999-2003 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
$Revision$
$Date$
$Id$
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>
**/
static const char rcsId[] = "$Id$";
#include <GSWeb/GSWeb.h>
#include <time.h>
//====================================================================
@implementation NSString (SBString)
//--------------------------------------------------------------------
-(BOOL)isANumber
{
return [self isAFloatNumber];
};
//--------------------------------------------------------------------
-(BOOL)isAFloatNumber
{
//TODOV
NSRange nonNumberRange;
NSMutableCharacterSet* nonNumberCS=[[NSCharacterSet decimalDigitCharacterSet]
mutableCopy];
[nonNumberCS addCharactersInString:@".Ee-+"];
[nonNumberCS invert];
nonNumberRange = [self rangeOfCharacterFromSet:nonNumberCS];
return (nonNumberRange.length<=0);
};
//--------------------------------------------------------------------
-(BOOL)isAnIntegerNumber
{
//TODOV
NSRange nonNumberRange;
NSMutableCharacterSet* nonNumberCS=[[NSCharacterSet decimalDigitCharacterSet]
mutableCopy];
[nonNumberCS addCharactersInString:@".-+"];
[nonNumberCS invert];
nonNumberRange = [self rangeOfCharacterFromSet:nonNumberCS];
return (nonNumberRange.length<=0);
};
//--------------------------------------------------------------------
#ifdef LONG_LONG_MAX
-(BOOL)isAnIntegerNumberWithMin:(long long)min
max:(long long)max
#else
-(BOOL)isAnIntegerNumberWithMin:(long)min
max:(long)max
#endif
{
if ([self isAnIntegerNumber])
{
//TODO
long v=[self longValue];
if (v>=min && v<=max)
return YES;
else
return NO;
}
else
return NO;
};
//--------------------------------------------------------------------
-(BOOL)isAnUnsignedIntegerNumber
{
//TODOV
NSRange nonNumberRange;
NSMutableCharacterSet* nonNumberCS=[[NSCharacterSet decimalDigitCharacterSet]
mutableCopy];
[nonNumberCS addCharactersInString:@".+"];
[nonNumberCS invert];
nonNumberRange = [self rangeOfCharacterFromSet:nonNumberCS];
return (nonNumberRange.length<=0);
};
//--------------------------------------------------------------------
#ifdef LONG_LONG_MAX
-(BOOL)isAnUnsignedIntegerNumberWithMax:(unsigned long long)max
#else
-(BOOL)isAnUnsignedIntegerNumberWithMax:(unsigned long)max
#endif
{
if ([self isAnUnsignedIntegerNumber])
{
//TODO
unsigned long v=[self ulongValue];
if (v<=max)
return YES;
else
return NO;
}
else
return NO;
};
//--------------------------------------------------------------------
-(BOOL)isStartingWithNumber
{
//TODOV
NSRange numberRange;
NSMutableCharacterSet* numberCS=[[NSCharacterSet decimalDigitCharacterSet]
mutableCopy];
[numberCS addCharactersInString:@".-+"];
numberRange = [self rangeOfCharacterFromSet:numberCS];
return (numberRange.location==0 && numberRange.length>0);
};
//--------------------------------------------------------------------
-(long)longValue
{
return atol([self cString]);
}
//--------------------------------------------------------------------
-(unsigned long)ulongValue
{
return strtoul([self cString],NULL,10);
}
//--------------------------------------------------------------------
-(long long)longLongValue
{
long long v=0;
NSScanner* scanner = [NSScanner scannerWithString:self];
[scanner scanLongLong:&v];
return v;
}
@end
//====================================================================
@implementation NSString (UniqueIdString)
//--------------------------------------------------------------------
+(NSString*)stringUniqueIdWithLength:(int)length
{
int i=0;
NSTimeInterval ti=[[NSDate date]timeIntervalSinceReferenceDate];
NSMutableData* data=nil;
void* pData=NULL;
NSString* dataHex=nil;
NSAssert1(length>=sizeof(ti),@"Too short length: %d",length);
data=[NSMutableData dataWithLength:length];
NSAssert(data,@"no data");
pData=[data mutableBytes];
NSAssert(pData,@"no pData");
NSDebugMLog(@"pData=%p",pData);
*((NSTimeInterval*)pData)=ti;
pData+=sizeof(ti);
length-=sizeof(ti);
srand(time(NULL));
for(i=0;i<length;i++)
{
*((unsigned char*)pData)=(unsigned char)(256*rand()/(RAND_MAX+1.0));
pData++;
};
NSDebugMLog(@"pData=%p",pData);
dataHex=DataToHexString(data);
NSDebugMLog(@"dataHex %p=%@",dataHex,dataHex);
return dataHex;
};
//====================================================================
@implementation NSString (stringWithObject)
//--------------------------------------------------------------------
+(NSString*)stringWithObject:(id)object
{
NSString* string=nil;
if (object)
{
if ([object isKindOfClass:[NSString class]])
string=[[object copy] autorelease];
#ifdef GDL2
else if ([object isKindOfClass:[EONull class]])
string=@"";
#else
else if ([object isKindOfClass:[NSNull class]])
string=@"";
#endif
else if ([object respondsToSelector:@selector(stringValue)])
string=[object stringValue];
else if ([object respondsToSelector:@selector(description)])
string=[object description];
else
string=object;
};
return string;
};
@end
//====================================================================
@implementation NSString (uniqueFileName)
//--------------------------------------------------------------------
+(NSString*)stringForUniqueFilenameInDirectory:(NSString*)directory
withPrefix:(NSString*)prefix
withSuffix:(NSString*)suffix
{
NSString* filename=nil;
NSFileManager* fileManager=nil;
NSArray* directoryContents=nil;
LOGObjectFnStart();
fileManager=[NSFileManager defaultManager];
directoryContents=[fileManager directoryContentsAtPath:directory];
if (!directoryContents)
{
//ERROR
}
else
{
int attempts=16;
while(attempts-->0 && !filename)
{
NSString* unique=[NSString stringUniqueIdWithLength:16];
filename=[NSString stringWithFormat:@"%@_%@_%@",prefix,unique,suffix];
if ([directoryContents containsObject:filename])
filename=nil;
};
};
if (filename)
filename=[directory stringByAppendingPathComponent:filename];
LOGObjectFnStop();
return filename;
};
@end
//====================================================================
@implementation NSString (Qutotes)
//--------------------------------------------------------------------
-(BOOL)hasPrefix:(NSString*)prefix
andSuffix:(NSString*)suffix
{
return [self hasPrefix:prefix] && [self hasSuffix:suffix];
};
//--------------------------------------------------------------------
-(NSString*)stringWithoutPrefix:(NSString*)prefix
andSuffix:(NSString*)suffix
{
return [[self stringByDeletingPrefix:prefix] stringByDeletingSuffix:suffix];
};
//--------------------------------------------------------------------
-(BOOL)isQuotedWith:(NSString*)quote
{
return [self hasPrefix:quote
andSuffix:quote];
};
//--------------------------------------------------------------------
-(NSString*)stringWithoutQuote:(NSString*)quote
{
return [self stringWithoutPrefix:quote
andSuffix:quote];
};
@end
//====================================================================
@implementation NSMutableString (Qutotes)
//--------------------------------------------------------------------
-(void)removePrefix:(NSString*)prefix
andSuffix:(NSString*)suffix
{
[self deletePrefix:prefix];
[self deleteSuffix:suffix];
};
//--------------------------------------------------------------------
-(void)removeQuote:(NSString*)quote
{
[self removePrefix:quote
andSuffix:quote];
};
@end