mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-24 12:11:18 +00:00
* GSWeb.framework/GSWGNUmakefile: o removed NSObject+IVarAccess+PerformSel.* * GSWeb.framework/GSWConstants.m: o fix GSWHTTPHeader_Response_HeaderLineEnd: remove space at the begining o use RCS_ID * GSWeb.framework/Adaptors/common/GSWHTTPResponse.c: o fix status in GSWHTTPResponse_New() * GSWAdaptors/Apache/mod_gsweb.c: o fixes bad returned status o traces * GSWeb.framework/GSWTemplateParserANTLR.m: o removed logs o fixes for warnings o use RCS_ID * GSWeb.framework/GSWApplication.m: o use RCS_ID o added logs o new method to begin rewrite exception handling * GSWeb.framework/GSWRequest.m: o logs o fix in -_getFormValuesFromMultipartFormData to handle more than one value per name o use RCS_ID o -fix bad types in uriElementForKey: * GSWeb.framework/GSWConditional.m: o added asserts o use RCS_ID * GSWeb.framework/GSWHTMLStaticElement.m: o added asserts o clean warnings o use RCS_ID * GSWeb.framework/GSWComponentReference.m: o added asserts o use RCS_ID * GSWeb.framework/GSWActiveImage.m: o added asserts * GSWeb.framework/GSWComponentContent.m: o added asserts o use RCS_ID * GSWeb.framework/GSWForm.m: o added asserts o use RCS_ID * GSWeb.framework/GSWHTMLDynamicElement.m: o added asserts o use RCS_ID * GSWeb.framework/GSWHTMLURLValuedElement.m: o use RCS_ID o added asserts * GSWeb.framework/GSWRepetition.m: o added asserts o use RCS_ID * GSWeb.framework/GSWExtensions.framework/GNUmakefile: o added GSWPageRestorationErrorPage.gswc * GSWeb.framework/GSWFileUploadComponent.m: o use RCS_ID * GSWeb.framework/GSWImage.m: o Don't output nil height/width o fix: get component before using ! o use RCS_ID * GSWeb.framework/GSWElementIDString.m: o in -initWithCoder: retain _string o use RCS_ID * GSWeb.framework/GSWElementIDString.h: o cleaned * config.h.in: o define RCS_ID like in GDL2 * GSWeb.framework/GSWDirectActionRequestHandler.[hm]: o added +additionalRequestPathArrayFromRequest: o enable directAction with additional path components o use RCS_ID * GSWeb.framework/GSWDirectAction.[hm]: o added -additionalRequestPathArray o use RCS_ID * GSWeb.framework/GSWeb.h: o include GSCategories.h * GSWeb.framework/GSWDebug.m: o use RCS_ID * GSWeb.framework/GSWPageDefParserExt.m: o use RCS_ID * GSWeb.framework/GSWPageDefElement.m: o use RCS_ID * GSWeb.framework/GSWDeployedBundle.m: o use RCS_ID * GSWeb.framework/GSWProjectBundle.m: o use RCS_ID * GSWeb.framework/GSWStats.m: o use RCS_ID * GSWeb.framework/GSWBundle.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWTemplateParser.m:: o clean warnings o use RCS_ID * GSWeb.framework/GSWTemplateParserXML.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWComponent.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWDisplayGroup.m: o clean warnings o fix -validateValue:forKey: call o use RCS_ID * GSWeb.framework/GSWHTMLParserExt.m: o use RCS_ID * GSWeb.framework/GSWAssociation.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWResourceManager.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWSession.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWMultiKeyDictionary.m: o use RCS_ID * GSWeb.framework/GSWResponse.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWStatisticsStore.m: o clean warnings * GSWeb.framework/GSWAdaptor.m: o use RCS_ID * GSWeb.framework/GSWGeometricRegion.[hm]: o types change o use RCS_ID * GSWeb.framework/GSWActiveImage.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWBody.m: o use RCS_ID * GSWeb.framework/GSWTextField.m: o use RCS_ID * GSWeb.framework/GSWSubmitButton.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWHTMLBareString.m: o use RCS_ID * GSWeb.framework/GSWHTMLComment.m: o use RCS_ID * GSWeb.framework/GSWApplet.m: o use RCS_ID * GSWeb.framework/GSWBrowser.m: o use RCS_ID * GSWeb.framework/GSWCheckBoxList.m: o use RCS_ID * GSWeb.framework/GSWEmbeddedObject.m: o use RCS_ID * GSWeb.framework/GSWFrame.m: o use RCS_ID * GSWeb.framework/GSWGenericContainer.m: o use RCS_ID * GSWeb.framework/GSWGenericElement.m: o use RCS_ID * GSWeb.framework/GSWHyperlink.m: o use RCS_ID o clean warnings * GSWeb.framework/GSWImageButton.m: o use RCS_ID o clean warnings * GSWeb.framework/GSWJavaScript.m: o use RCS_ID * GSWeb.framework/GSWNestedList.m: o use RCS_ID * GSWeb.framework/GSWParam.m: o use RCS_ID * GSWeb.framework/GSWPasswordField.m: o use RCS_ID * GSWeb.framework/GSWPopUpButton.m: o use RCS_ID * GSWeb.framework/GSWRadioButtonList.m: o use RCS_ID * GSWeb.framework/GSWResetButton.m: o use RCS_ID * GSWeb.framework/GSWSwitchComponent.m: o use RCS_ID * GSWeb.framework/GSWVBScript.m: o use RCS_ID * GSWeb.framework/GSWString.m: o use RCS_ID * GSWeb.framework/GSWText.m: o use RCS_ID * GSWeb.framework/GSWCookie.m: o use RCS_ID * GSWeb.framework/GSWRequestHandler.m: o use RCS_ID * GSWeb.framework/GSWMailDelivery.m: o use RCS_ID * GSWeb.framework/GSWComponentRequestHandler.m: o use RCS_ID o clean warnings * GSWeb.framework/GSWKeyValueAssociation.m: o use RCS_ID * GSWeb.framework/GSWHTMLStaticGroup.m: o use RCS_ID * GSWeb.framework/GSWConstantValueAssociation.m: o use RCS_ID * GSWeb.framework/GSWDynamicURLString.m: o use RCS_ID * GSWeb.framework/GSWBindingNameAssociation.m: o use RCS_ID * GSWeb.framework/GSWBindingNameAssociation.[hm] o clean warnings o use RCS_ID * GSWeb.framework/GSWURLValuedElementData.m: o clean warnings o use RCS_ID * GSWeb.framework/GSWToggle.m: o use RCS_ID * GSWeb.framework/GSWFileUpload.m: o use RCS_ID * GSWeb.framework/GSWResourceURL.m: o use RCS_ID * GSWeb.framework/GSWProcFS.m: o use RCS_ID * GSWeb.framework/GSWActionURL.m: o use RCS_ID * GSWeb.framework/GSWContext.m: o use RCS_ID * GSWeb.framework/GSWDefaultAdaptorThread.m: o use RCS_ID * GSWeb.framework/GSWDynamicElement.m: o use RCS_ID * GSWeb.framework/GSWeb.m: o use RCS_ID * GSWeb.framework/GSWElement.m: o use RCS_ID * GSWeb.framework/GSWResourceRequestHandler.m: o use RCS_ID * GSWeb.framework/GSWServerSessionStore.m: o use RCS_ID * GSWeb.framework/GSWSessionStore.m: o use RCS_ID * GSWeb.framework/GSWSessionTimeOut.m: o use RCS_ID * GSWeb.framework/GSWSessionTimeOutManager.m: o use RCS_ID * GSWeb.framework/GSWTransactionRecord.m: o use RCS_ID * GSWeb.framework/GSWUtils.m: o use RCS_ID * GSWeb.framework/GSWWOCompatibility.m: o use RCS_ID * GSWeb.framework/NSString+HTML.m: o use RCS_ID * GSWeb.framework/NSString+Trimming.m: o use RCS_ID git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@16216 72102866-910b-0410-8b05-ffd578937521
317 lines
8.9 KiB
Objective-C
317 lines
8.9 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>
|
|
**/
|
|
|
|
#include "config.h"
|
|
|
|
RCS_ID("$Id$")
|
|
|
|
#include "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++)
|
|
{
|
|
int c=rand();
|
|
*((unsigned char*)pData)=(unsigned char)(256.0*c/(RAND_MAX+1.0));
|
|
//NSDebugMLog(@"i=%d c=%i max=%d c=%u",i,c,(int)RAND_MAX,(unsigned int)(*((unsigned char*)pData)));
|
|
pData++;
|
|
};
|
|
//NSDebugMLog(@"pData=%p",pData);
|
|
//NSDebugMLog(@"pData length=%d",(int)(pData-[data mutableBytes]));
|
|
|
|
dataHex=[data hexadecimalRepresentation];
|
|
//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
|
|
|