mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-25 04:31:16 +00:00
* GSWExtensionsGSW.framework/GSWLogin.m removed logs * GSWExtensionsGSW.framework/GNUmakefile added ADDITIONAL_OBJCFLAGS = -Werror-implicit-function-declaration * GSWExtensionsGSW.framework/GSWCacheElement.m removed logs, use object_getClassName * GSWExtensionsGSW.framework/GSWValidationFailureComponent.m * GSWExtensionsGSW.framework/GSWTabComponent.m * GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m * GSWExtensionsGSW.framework/GSWSimpleFormComponent.m * GSWeb.framework/GSWApplication.m removed logs, _validateAPI ClassIsKindOfClass -> GSObjCIsKindOf * GSWeb.framework/GSWAction.m include <GNUstepBase/NSObject+GNUstepBase.h> removed logs and unused (commented) code * GSWeb.framework/GSWResourceManager.h removed _validateAPI * GSWeb.framework/GSWImageButton.m added #include <GNUstepBase/NSObject+GNUstepBase.h> removed logs and unused (commented) code * GSWeb.framework/NSString+HTML.h changed int to NSUInteger / NSInteger * GSWeb.framework/GSWResourceManager.m removed logs, _validateAPI * GSWeb.framework/GSWContext.m LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWRequestHandler.m include <GNUstepBase/NSObject+GNUstepBase.h> LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/NSString+HTML.m include <GNUstepBase/NSString+GNUstepBase.h> changed int to NSUInteger use memmove in GSWMemMove macro disabled testStringByConvertingHTML removed logs fixed warnings * GSWeb.framework/GSWMultiKeyDictionary.m removed logs * GSWeb.framework/GSWVBScript.m removed logs * GSWeb.framework/NSNonBlockingFileHandle.m removed logs * GSWeb.framework/GSWStatisticsStore.h removed useless @interface / @end for the same class * GSWeb.framework/GSWLifebeatThread.m removed include <GNUstepBase/GSCategories.h> removed logs * GSWeb.framework/GSWStatisticsStore.m removed logs include <GNUstepBase/NSObject+GNUstepBase.h> include <GNUstepBase/NSString+GNUstepBase.h> implement _purgePathsStatistics, _updatePathsStatisticsWithPaths removed useless @implementation / @end for the same class * GSWeb.framework/GSWCookie.m removed logs * GSWeb.framework/GNUmakefile added ADDITIONAL_OBJCFLAGS = -Werror-implicit-function-declaration * GSWeb.framework/GSWRecording.m removed logs * GSWeb.framework/GSWToggle.m removed logs * GSWeb.framework/GSWMessage.m include <GNUstepBase/NSObject+GNUstepBase.h> globalDefaultEncoding = [NSString defaultCStringEncoding]; (see http://wiki.gnustep.org/index.php/GSWebFAQ ) use NSUInteger for index LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWDefaultAdaptor.m include <GNUstepBase/NSObject+GNUstepBase.h> LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWJavaScript.m * GSWeb.framework/GSWClientSideScript.m removed logs * GSWeb.framework/GSWNestedList.m removed logs LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWEmbeddedObject.m LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWRequest.h removed _validateAPI * GSWeb.framework/GSWRequest.m add includes removed _validateAPI removed logs LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWUtils.h unsigned int -> NSUInteger * GSWeb.framework/Resources/languages.plist added languages * GSWeb.framework/GSWUtils.m add includes unsigned int -> NSUInteger removed logs * GSWeb.framework/GSWComponentReference.m removed logs * GSWeb.framework/GSWGeometricRegion.m add includes removed logs * GSWeb.framework/GSWKeyValueAssociation.m add includes removed logs LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWHiddenField.m removed logs * GSWeb.framework/GSWParam.m add includes removed logs LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/NSString+Trimming.h * GSWeb.framework/NSString+Trimming.m removed longValue, ulongValue, longLongValue; removed logs * GSWeb.framework/GSWStaticResourceRequestHandler.m removed logs * GSWeb.framework/GSWURLValuedElementData.m removed logs * GSWeb.framework/GSWDirectAction.m takeValue -> setValue removed logs int -> NSUInteger * GSWeb.framework/GSWComponentDefinition.m add includes removed logs LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWAssociation.m add includes LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; removed logs * GSWeb.framework/GSWSession.h * GSWeb.framework/GSWSession.m unsigned int-> NSUInteger add includes LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; removed logs David Ayers: pls check sleepInContext! removed _validateAPI, __setContextCounterIncrementingEnabled, __counterIncrementingEnabledFlag * GSWeb.framework/GSWFileUpload.m removed logs * GSWeb.framework/GSWApplet.m add includes LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWGenericElement.m removed logs GSWeb.framework/GSWTemplateParser.m add includes * GSWeb.framework/GSWTemporaryElement.m removed logs * GSWeb.framework/GSWResponse.m add include removed docStructure checks removed logs * GSWeb.framework/GSWProjectBundle.m add include LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; removed logs * GSWeb.framework/GSWWorkerThread.m added - drain removed NSLog * GSWeb.framework/GSWApplication+Defaults.m add include LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; removed logs * GSWeb.framework/GSWActiveImage.m * GSWeb.framework/GSWDirectActionRequestHandler.m * GSWeb.framework/GSWConstantValueAssociation.m * GSWeb.framework/NSData+Compress.m removed logs * GSWeb.framework/GSWHTMLStaticElement.m add includes LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; removed logs * GSWeb.framework/GSWServerSessionStore.m removed logs * GSWeb.framework/GSWAdaptor.m add includes LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWDeployedBundle.m removed logs add includes * GSWeb.framework/GSWSubmitButton.m removed logs * GSWeb.framework/GSWDeclarationParser.m add includes removed logs * GSWeb.framework/GSWBundle.m add includes removed logs clearCache * GSWeb.framework/GSWWOCompatibility.h fixed typo in WOMessage * GSWeb.framework/GSWSessionTimeOut.m removed logs * GSWeb.framework/GSWPopUpButton.m add includes * GSWeb.framework/GSWComponent.m add includes LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWHTTPIO.m add include * GSWeb.framework/GSWBindingNameAssociation.m takeValue -> setValue * GSWeb.framework/GSWHTMLTemplateParser.m removed logs * GSWeb.framework/GSWResetButton.m removed logs * GSWeb.framework/GSWDebug.h/m disabled log funtions * GSWeb.framework/GSWActionRequestHandler.m add includes removed logs * GSWeb.framework/GSWSwitchComponent.m * GSWeb.framework/GSWSessionTimeOutManager.m removed logs * GSWeb.framework/GSWMailDelivery.m add includes removed logs * GSWeb.framework/GSWDynamicURLString.h * GSWeb.framework/GSWDynamicURLString.m unsigned int -> NSUInteger removed checkURL add includes * GSWeb.framework/GSWProcFS.m removed logs * GSWeb.framework/GSWApplication.h removed _validateAPI * GSWeb.framework/GSWResourceRequestHandler.m add include removed logs LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; * GSWeb.framework/GSWSessionStore.h removed _validateAPI * GSWeb.framework/GSWSessionStore.m add include removed _validateAPI removed logs * GSWExtensions.framework/GSWLongResponsePage.m * GSWExtensions.framework/GSWExceptionPage.m * GSWExtensions.framework/GSWMetaRefresh.m * GSWExtensions.framework/GSWCollapsibleComponentContent.m removed logs * GSWExtensions.framework/GNUmakefile added ADDITIONAL_OBJCFLAGS = -Werror-implicit-function-declaration * GSWExtensions.framework/GSWStatsPage.m removed logs unsigned int -> NSUInteger * Examples/hello/HelloPage.wo/HelloPage.html * Examples/hello/Main.wo/Main.html * Examples/hello/Hello.m convert to UTF8 The change of LOGObjectFnNotImplemented(); -> [self notImplemented: _cmd]; will show where we need to implement functionality. Please send bug reports! -- dw git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@30584 72102866-910b-0410-8b05-ffd578937521
279 lines
7.9 KiB
Objective-C
279 lines
7.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);
|
|
};
|
|
|
|
|
|
@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;
|
|
};
|
|
@end
|
|
|
|
//====================================================================
|
|
|
|
|
|
@implementation NSString (stringWithObject)
|
|
|
|
//--------------------------------------------------------------------
|
|
+(NSString*)stringWithObject:(id)object
|
|
{
|
|
return NSStringWithObject(object);
|
|
};
|
|
@end
|
|
|
|
//====================================================================
|
|
@implementation NSString (uniqueFileName)
|
|
|
|
//--------------------------------------------------------------------
|
|
+(NSString*)stringForUniqueFilenameInDirectory:(NSString*)directory
|
|
withPrefix:(NSString*)prefix
|
|
withSuffix:(NSString*)suffix
|
|
{
|
|
NSString* filename=nil;
|
|
NSFileManager* fileManager=nil;
|
|
NSArray* directoryContents=nil;
|
|
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];
|
|
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
|
|
|