2002-08-04 18:00:11 +00:00
|
|
|
/** NSString+Trimming.m - <title>GSWeb: Class NSString with Trimming </title>
|
|
|
|
|
2003-01-19 15:33:07 +00:00
|
|
|
Copyright (C) 1999-2003 Free Software Foundation, Inc.
|
2002-08-04 18:00:11 +00:00
|
|
|
|
|
|
|
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
|
2003-03-21 14:32:57 +00:00
|
|
|
Date: Jan 1999
|
2000-01-22 12:49:49 +00:00
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
$Revision$
|
|
|
|
$Date$
|
2003-01-19 15:33:07 +00:00
|
|
|
$Id$
|
2002-08-04 18:00:11 +00:00
|
|
|
|
2000-01-22 12:49:49 +00:00
|
|
|
This file is part of the GNUstep Web Library.
|
|
|
|
|
2002-08-04 18:00:11 +00:00
|
|
|
<license>
|
2000-01-22 12:49:49 +00:00
|
|
|
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.
|
2002-08-04 18:00:11 +00:00
|
|
|
</license>
|
|
|
|
**/
|
2000-01-22 12:49:49 +00:00
|
|
|
|
2003-03-21 14:32:57 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
2003-01-22 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/Makefile.postamble:
o use $(LN_S) -f in install-WO-headers
o added $(MKDIRS) $(GNUSTEP_HEADERS)/$(GSWExtensions_wo_HEADER_FILES_INSTALL_DIR);
* GSWExtensionsGSW.framework/Makefile.postamble: use $(LN_S) -f in install-WO-headers
2003-01-20 David Ayers <d.ayers@inode.at>
* Makefile.postamble
o added support for make gswnames=(gsw,wo,all) (corrected
typo)
o reinserted support for $(INSTALL_ROOT_DIR)
* config.h.in
o added HAVE_GDL2
* configure
o added support for --with-gswnames=(gsw,wo,all)
o set LIBWRAP during configure
o added config.mak.in as configurable file
* configure.ac
o (see configure)
* config.mak: removed (replaced by config.mak.in)
* config.mak.in: new file
o added support for make gswnames=(gsw,wo,all)
* gsweb.make.in
o add GSANTLR as auxiliary lib
o add gsweb libs to AUXILIARY_GSW_LIBS
o include correct extensions for GSW/WO-libs
* gsweb_wo.make: new file
* GSWeb/GSWConfig.h
o changed support for GSWEB_WONAMES
o conditionally import file GSWWOCompatiblity
here instead of in GSWeb.h
* GSWeb/GNUMakefile
o added support for make gswnames=(gsw,wo,all)
o ensure each lib gets built with its own object files
o removed deactivated framework extension determination code
o removed reference to unused files:
GSWeb.m, GSWWOCompatibility.m
o added references to new files:
GSWExtenstions.h, GSWExtWOCompatibility.h
o added support to create WO header files
* GSWeb/Makefile.postamble
o changed support to install WO header files according to
make gswnames=(gsw,wo,all)
o remove Makefile.preamble during distclean
* GSWeb/Makefile.preamble.in
o fixed typo
* GSWeb/GSWeb.h
o moved GSW/WO-Name-mapping to GSWWOCompatibility.h
o replaced inclusions of
<GSWeb/file.h> with "file.h"
* GSWeb/GSWeb.m: removed
* GSWeb/GSWWOCompatibility.h
o changed GSWEB_WONAMES handling
o removed hybrid namespace WO subclasses
o moved & reorganized GSW/WO-Name-mapping from GSWeb.h
o inlucluded missing GSW/WO-Name-mappings
* GSWeb/GSWWOCompatibility.m: removed
* GSWeb/*.m
o replaced inclusions of
<GSWeb/file.h> with "file.h"
* GSWeb/GSWApplication.m
o remove special GSW/WO handling of WOApp
* GSWeb/WebObject/WO*: removed
* GSWeb/WebObject/WebObjects
o replaced inclusions of
<GSWeb/file.h> with "file.h"
* GSWExtensions/GNUMakefile
o added support for make gswnames=(gsw,wo,all)
o ensure each lib gets built with its own object files
o removed deactivated framework extension determination code
o added references to new files:
GSWExtenstions.h, GSWExtWOCompatibility.h
o added support to create WO header files
* GSWExtensions/Makefile.preamble
o let gnustep make figure whether to link agains debug libs
o added support for make gswnames=(gsw,wo,all)
* GSWExtensions/Makefile.postamble
o changed support to install WO header files according to
make gswnames=(gsw,wo,all)
* GSWExtensions/*.m
o replaced inclusions of
<GSWeb/GSWeb.h> with "GSWExtWOCompatibility.h"
o replaces inclusions of
<GSWExtensions/file.h> with "file.h"
* GSWExtensions/GSWExtensions.h: new file
* GSWExtensions/WOExtensions.h: new file
* GSWExtensions/GSWExtWOCompatibility.h: new file
* GSWExtensionsGSW/GNUMakefile
o added support for make gswnames=(gsw,wo,all)
o ensure each lib gets built with its own object files
o removed deactivated framework extension determination code
o added references to new file GSWExtGSWWOCompatibility.h
o added support to create WO header files
* GSWExtensionsGSW/Makefile.pramble
o let gnustep make figure whether to link agains debug libs
o added support for make gswnames=(gsw,wo,all)
o removed GSWExtensions from ADDITIONAL_LIB_DIRS
* GSWExtensionsGSW/*.m
o replaced inclusions of
<GSWeb/GSWeb.h> with "GSWExtGSWWOCompatibility.h"
* GSWExtensions/GSWExtGSWWOCompatibility.h: new file
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@15675 72102866-910b-0410-8b05-ffd578937521
2003-01-22 12:24:26 +00:00
|
|
|
#include "GSWeb.h"
|
* GSWeb/GSWUtils.m
fix rangeOfData:range:
* GSWExtensions/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswd
set framework binding
* GSWExtensions/GSWCollapsibleComponentContent.[hm]
handle framework binding
* GSWExtensions/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswd
set framework binding
* GSWExtensions/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd
set framework binding
* GSWExtensions/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd
set framework binding
* GSWeb/GSWApplication.[hm]
add -frameworkNameGSWExtensions
* GSWeb/GSWPasswordField.m
respect GNUstep coding standard (curly brackets placement, etc.)
* GSWeb/GSWPasswordField.h
remove unneeded declarations
* GSWeb/GSWHiddenField.m
fix
* GSWeb/GSWHiddenField.h
remove unneeded declarations
* GSWeb/GSWString.m
fix appendToResponse:inContext: when formattedValue is nil
respect GNUstep coding standard (curly brackets placement, etc.)
* GSWeb/GSWTemplateParser.m:
fix exception error messages
* GSWeb/GSWPopUpButton.m
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
* GSWeb/GSWRepetition.m
respect GNUstep coding standard (curly brackets placement, etc.)
reimplement startIndex and stopIndex bindings
clean code
* GSWeb/GSWCheckBoxList.m
fix -initWithName:...: prefix__Key duplicate, _value
* GSWeb.framework/GSWRadioButtonList.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
Fix bug in -initWithName (valueAssoc)
Fix bug in _slowTakeValuesFromRequest: (call NSStringWithObject())
* GSWeb/GSWTextField.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
Fix bug (call NSStringWithObject())
* GSWeb/GSWText.m
respect GNUstep coding standard (curly brackets placement, etc.)
clean code
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
Fix bug (call NSStringWithObject())
* GSWeb/GSWCheckBox.m
respect GNUstep coding standard (curly brackets placement, etc.)
clean code
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
* GSWeb/GSWRadioButton.m
respect GNUstep coding standard (curly brackets placement, etc.)
clean code
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
* GSWeb.framework/GSWInput.h
remove initWithName:associations:contentElements:
* GSWeb.framework/GSWInput.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
ensure name is a string in -nameInContext:
fix name escaping in -_appendNameAttributeToResponse:
ensure value is a string in _appendValueAttributeToResponse:
remove initWithName:associations:contentElements:
* GSWeb/GSWHTMLDynamicElement.m
respect GNUstep coding standard (curly brackets placement, etc.)
ensure string conversion in -_finishInitialization
rename variables to make code understandable
* GSWeb/GSWConditional.m
respect GNUstep coding standard (curly brackets placement, etc.)
* GSWeb/GSWActionImage.m
respect GNUstep coding standard (curly brackets placement, etc.)
fix secure stuff
ensure string conversion
* GSWeb/GSWActionURL.m
respect GNUstep coding standard (curly brackets placement, etc.)
ensure string conversion
* GSWeb/GSWBody.h
remove uneeded declarations
* GSWeb/GSWBody.m
remove uneeded stuff
fix initWithName:...
* GSWeb.framework/GSWBrowser.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
rename variables to make code understandable
Fix bugs
* GSWeb.framework/GSWFileUpload.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
* GSWeb/GSWFrame.h
remove uneeded declarations
* GSWeb/GSWFrame.m
respect GNUstep coding standard (curly brackets placement, etc.)
clean code
* GSWeb/GSWGenericContainer.h
remove uneeded declarations
change inheritence
* GSWeb/GSWGenericContainer.m
respect GNUstep coding standard (curly brackets placement, etc.)
clean code
* GSWeb/GSWGenericElement.h
remove uneeded declarations
change inheritence
* GSWeb/GSWGenericElement.m
respect GNUstep coding standard (curly brackets placement, etc.)
clean code
* GSWeb/GSWForm.h
remove uneeded declarations
* GSWeb/GSWForm.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
ensure string conversion
* GSWeb/GSWHTMLURLValuedElement.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
ensure string conversion
finish appendAttributesToResponse:inContext implementation
* GSWeb/GSWHyperlink.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
ensure string conversion
* GSWeb/GSWImage.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
* GSWeb/GSWClientSideScript.h
remove uneeded declarations
change inheritence
add -setLanguage
* GSWeb/GSWJavaScript.m
clean and update code
* GSWeb/GSWSubmitButton.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
* GSWeb/GSWImageButton.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
* GSWeb/GSWSwitchComponent.m
clean and update code
* GSWeb/GSWJavaScript.m
clean and update code
* GSWeb/GSWContext.m
clean & fix -computeQueryDictionaryWithPath:queryDictionary:otherQueryDictionary:
fix componentActionURL... methods
* GSWeb/GSWHTTPIO.m:
use GSWeb_appendStringWithImpPtr()
* GSWeb/GSWActionURL.h
remove uneeded declarations
* GSWeb/GSWPrivate.h
add GSWeb_objectAtIndexWithImpPtr
* GSWDatabase/WODisplayGroup.m
Don't raise validation exceptions in _qualifierForKey:value:operatorSelector:
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@37899 72102866-910b-0410-8b05-ffd578937521
2014-05-22 11:09:50 +00:00
|
|
|
#include "GSWPrivate.h"
|
2003-01-19 15:33:07 +00:00
|
|
|
#include <time.h>
|
2000-01-22 12:49:49 +00:00
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
@implementation NSString (SBString)
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(BOOL)isANumber
|
|
|
|
{
|
|
|
|
return [self isAFloatNumber];
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(BOOL)isAFloatNumber
|
|
|
|
{
|
|
|
|
//TODOV
|
|
|
|
NSRange nonNumberRange;
|
|
|
|
NSMutableCharacterSet* nonNumberCS=[[NSCharacterSet decimalDigitCharacterSet]
|
2002-08-04 18:00:11 +00:00
|
|
|
mutableCopy];
|
2000-01-22 12:49:49 +00:00
|
|
|
[nonNumberCS addCharactersInString:@".Ee-+"];
|
|
|
|
[nonNumberCS invert];
|
|
|
|
nonNumberRange = [self rangeOfCharacterFromSet:nonNumberCS];
|
|
|
|
return (nonNumberRange.length<=0);
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(BOOL)isAnIntegerNumber
|
|
|
|
{
|
|
|
|
//TODOV
|
|
|
|
NSRange nonNumberRange;
|
|
|
|
NSMutableCharacterSet* nonNumberCS=[[NSCharacterSet decimalDigitCharacterSet]
|
2002-08-04 18:00:11 +00:00
|
|
|
mutableCopy];
|
2000-01-22 12:49:49 +00:00
|
|
|
[nonNumberCS addCharactersInString:@".-+"];
|
|
|
|
[nonNumberCS invert];
|
|
|
|
nonNumberRange = [self rangeOfCharacterFromSet:nonNumberCS];
|
|
|
|
return (nonNumberRange.length<=0);
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2013-02-27 04:27:07 +00:00
|
|
|
-(BOOL)isAnIntegerNumberWithMin:(NSInteger) min
|
|
|
|
max:(NSInteger) max
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
if ([self isAnIntegerNumber])
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
2013-02-27 04:27:07 +00:00
|
|
|
NSInteger v=[self integerValue];
|
2002-08-04 18:00:11 +00:00
|
|
|
if (v>=min && v<=max)
|
|
|
|
return YES;
|
|
|
|
else
|
|
|
|
return NO;
|
|
|
|
}
|
2000-01-22 12:49:49 +00:00
|
|
|
else
|
2002-08-04 18:00:11 +00:00
|
|
|
return NO;
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(BOOL)isAnUnsignedIntegerNumber
|
|
|
|
{
|
|
|
|
//TODOV
|
|
|
|
NSRange nonNumberRange;
|
|
|
|
NSMutableCharacterSet* nonNumberCS=[[NSCharacterSet decimalDigitCharacterSet]
|
2002-08-04 18:00:11 +00:00
|
|
|
mutableCopy];
|
2000-01-22 12:49:49 +00:00
|
|
|
[nonNumberCS addCharactersInString:@".+"];
|
|
|
|
[nonNumberCS invert];
|
|
|
|
nonNumberRange = [self rangeOfCharacterFromSet:nonNumberCS];
|
|
|
|
return (nonNumberRange.length<=0);
|
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2013-02-27 04:27:07 +00:00
|
|
|
-(BOOL)isAnUnsignedIntegerNumberWithMax:(NSUInteger) max
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2013-02-27 04:27:07 +00:00
|
|
|
unsigned int v;
|
|
|
|
|
|
|
|
if ([self isAnUnsignedIntegerNumber])
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
2013-02-27 04:27:07 +00:00
|
|
|
//TODO
|
|
|
|
sscanf([self UTF8String], "%u", &v);
|
|
|
|
// v=[self unsignedIntegerValue];
|
|
|
|
if (v<=max)
|
|
|
|
return YES;
|
|
|
|
else
|
|
|
|
return NO;
|
2002-08-04 18:00:11 +00:00
|
|
|
}
|
2013-02-27 04:27:07 +00:00
|
|
|
else
|
|
|
|
return NO;
|
|
|
|
}
|
2000-01-22 12:49:49 +00:00
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
-(BOOL)isStartingWithNumber
|
|
|
|
{
|
|
|
|
//TODOV
|
|
|
|
NSRange numberRange;
|
|
|
|
NSMutableCharacterSet* numberCS=[[NSCharacterSet decimalDigitCharacterSet]
|
2002-08-04 18:00:11 +00:00
|
|
|
mutableCopy];
|
2000-01-22 12:49:49 +00:00
|
|
|
[numberCS addCharactersInString:@".-+"];
|
|
|
|
numberRange = [self rangeOfCharacterFromSet:numberCS];
|
|
|
|
return (numberRange.location==0 && numberRange.length>0);
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
@end
|
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
@implementation NSString (UniqueIdString)
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
+(NSString*)stringUniqueIdWithLength:(int)length
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
|
|
|
int i=0;
|
2013-02-27 04:27:07 +00:00
|
|
|
NSTimeInterval ti = [[NSDate date] timeIntervalSinceReferenceDate];
|
2000-01-22 12:49:49 +00:00
|
|
|
NSMutableData* data=nil;
|
|
|
|
void* pData=NULL;
|
2003-01-19 15:33:07 +00:00
|
|
|
NSString* dataHex=nil;
|
|
|
|
|
|
|
|
NSAssert1(length>=sizeof(ti),@"Too short length: %d",length);
|
|
|
|
|
|
|
|
data=[NSMutableData dataWithLength:length];
|
|
|
|
NSAssert(data,@"no data");
|
|
|
|
|
2000-01-22 12:49:49 +00:00
|
|
|
pData=[data mutableBytes];
|
2003-01-19 15:33:07 +00:00
|
|
|
NSAssert(pData,@"no pData");
|
2003-02-01 19:07:25 +00:00
|
|
|
//NSDebugMLog(@"pData=%p",pData);
|
2003-01-19 15:33:07 +00:00
|
|
|
|
|
|
|
*((NSTimeInterval*)pData)=ti;
|
2000-01-22 12:49:49 +00:00
|
|
|
pData+=sizeof(ti);
|
2003-01-19 15:33:07 +00:00
|
|
|
length-=sizeof(ti);
|
|
|
|
|
|
|
|
srand(time(NULL));
|
|
|
|
for(i=0;i<length;i++)
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
2003-02-01 19:07:25 +00:00
|
|
|
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)));
|
2003-01-19 15:33:07 +00:00
|
|
|
pData++;
|
2002-08-04 18:00:11 +00:00
|
|
|
};
|
2003-02-01 19:07:25 +00:00
|
|
|
//NSDebugMLog(@"pData=%p",pData);
|
|
|
|
//NSDebugMLog(@"pData length=%d",(int)(pData-[data mutableBytes]));
|
2003-01-19 15:33:07 +00:00
|
|
|
|
2003-02-01 19:07:25 +00:00
|
|
|
dataHex=[data hexadecimalRepresentation];
|
|
|
|
//NSDebugMLog(@"dataHex %p=%@",dataHex,dataHex);
|
2000-01-22 12:49:49 +00:00
|
|
|
return dataHex;
|
|
|
|
};
|
2003-05-14 08:30:22 +00:00
|
|
|
@end
|
2000-01-22 12:49:49 +00:00
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
|
2004-12-14 12:54:40 +00:00
|
|
|
|
|
|
|
@implementation NSString (stringWithObject)
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
+(NSString*)stringWithObject:(id)object
|
|
|
|
{
|
|
|
|
return NSStringWithObject(object);
|
|
|
|
};
|
2000-01-22 12:49:49 +00:00
|
|
|
@end
|
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
@implementation NSString (uniqueFileName)
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
+(NSString*)stringForUniqueFilenameInDirectory:(NSString*)directory
|
|
|
|
withPrefix:(NSString*)prefix
|
|
|
|
withSuffix:(NSString*)suffix
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2013-02-27 04:27:07 +00:00
|
|
|
NSString * filename = nil;
|
|
|
|
NSFileManager * fileManager = nil;
|
|
|
|
NSArray * directoryContents = nil;
|
|
|
|
NSError * error = nil;
|
|
|
|
|
|
|
|
fileManager = [NSFileManager defaultManager];
|
|
|
|
|
|
|
|
directoryContents = [fileManager contentsOfDirectoryAtPath:directory
|
|
|
|
error:&error];
|
|
|
|
if (!directoryContents)
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
2013-02-27 04:27:07 +00:00
|
|
|
//ERROR
|
|
|
|
NSDebugMLog(@"error %s %@",__PRETTY_FUNCTION__, error);
|
2002-08-04 18:00:11 +00:00
|
|
|
}
|
2013-02-27 04:27:07 +00:00
|
|
|
else
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
2013-02-27 04:27:07 +00:00
|
|
|
int attempts=16;
|
|
|
|
while(attempts-->0 && !filename)
|
2002-08-04 18:00:11 +00:00
|
|
|
{
|
2013-02-27 04:27:07 +00:00
|
|
|
NSString* unique=[NSString stringUniqueIdWithLength:16];
|
|
|
|
filename=[NSString stringWithFormat:@"%@_%@_%@",prefix,unique,suffix];
|
|
|
|
if ([directoryContents containsObject:filename])
|
|
|
|
filename=nil;
|
2002-08-04 18:00:11 +00:00
|
|
|
};
|
|
|
|
};
|
2013-02-27 04:27:07 +00:00
|
|
|
if (filename)
|
|
|
|
filename=[directory stringByAppendingPathComponent:filename];
|
|
|
|
return filename;
|
|
|
|
}
|
|
|
|
|
2000-01-22 12:49:49 +00:00
|
|
|
@end
|
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
@implementation NSString (Qutotes)
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(BOOL)hasPrefix:(NSString*)prefix
|
|
|
|
andSuffix:(NSString*)suffix
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return [self hasPrefix:prefix] && [self hasSuffix:suffix];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSString*)stringWithoutPrefix:(NSString*)prefix
|
|
|
|
andSuffix:(NSString*)suffix
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-09-22 14:27:04 +00:00
|
|
|
return [[self stringByDeletingPrefix:prefix] stringByDeletingSuffix:suffix];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(BOOL)isQuotedWith:(NSString*)quote
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return [self hasPrefix:quote
|
|
|
|
andSuffix:quote];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(NSString*)stringWithoutQuote:(NSString*)quote
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
return [self stringWithoutPrefix:quote
|
|
|
|
andSuffix:quote];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
@end
|
|
|
|
|
|
|
|
//====================================================================
|
|
|
|
@implementation NSMutableString (Qutotes)
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)removePrefix:(NSString*)prefix
|
|
|
|
andSuffix:(NSString*)suffix
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-09-22 14:27:04 +00:00
|
|
|
[self deletePrefix:prefix];
|
|
|
|
[self deleteSuffix:suffix];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------
|
2002-08-04 18:00:11 +00:00
|
|
|
-(void)removeQuote:(NSString*)quote
|
2000-01-22 12:49:49 +00:00
|
|
|
{
|
2002-08-04 18:00:11 +00:00
|
|
|
[self removePrefix:quote
|
|
|
|
andSuffix:quote];
|
2000-01-22 12:49:49 +00:00
|
|
|
};
|
|
|
|
@end
|
|
|
|
|
* GSWeb/GSWUtils.m
fix rangeOfData:range:
* GSWExtensions/GSWCollapsibleComponentContent.gswc/GSWCollapsibleComponentContent.gswd
set framework binding
* GSWExtensions/GSWCollapsibleComponentContent.[hm]
handle framework binding
* GSWExtensions/GSWPageRestorationErrorPage.gswc/GSWPageRestorationErrorPage.gswd
set framework binding
* GSWExtensions/GSWSessionCreationErrorPage.gswc/GSWSessionCreationErrorPage.gswd
set framework binding
* GSWExtensions/GSWSessionRestorationErrorPage.gswc/GSWSessionRestorationErrorPage.gswd
set framework binding
* GSWeb/GSWApplication.[hm]
add -frameworkNameGSWExtensions
* GSWeb/GSWPasswordField.m
respect GNUstep coding standard (curly brackets placement, etc.)
* GSWeb/GSWPasswordField.h
remove unneeded declarations
* GSWeb/GSWHiddenField.m
fix
* GSWeb/GSWHiddenField.h
remove unneeded declarations
* GSWeb/GSWString.m
fix appendToResponse:inContext: when formattedValue is nil
respect GNUstep coding standard (curly brackets placement, etc.)
* GSWeb/GSWTemplateParser.m:
fix exception error messages
* GSWeb/GSWPopUpButton.m
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
* GSWeb/GSWRepetition.m
respect GNUstep coding standard (curly brackets placement, etc.)
reimplement startIndex and stopIndex bindings
clean code
* GSWeb/GSWCheckBoxList.m
fix -initWithName:...: prefix__Key duplicate, _value
* GSWeb.framework/GSWRadioButtonList.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
Fix bug in -initWithName (valueAssoc)
Fix bug in _slowTakeValuesFromRequest: (call NSStringWithObject())
* GSWeb/GSWTextField.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
Fix bug (call NSStringWithObject())
* GSWeb/GSWText.m
respect GNUstep coding standard (curly brackets placement, etc.)
clean code
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
Fix bug (call NSStringWithObject())
* GSWeb/GSWCheckBox.m
respect GNUstep coding standard (curly brackets placement, etc.)
clean code
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
* GSWeb/GSWRadioButton.m
respect GNUstep coding standard (curly brackets placement, etc.)
clean code
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
* GSWeb.framework/GSWInput.h
remove initWithName:associations:contentElements:
* GSWeb.framework/GSWInput.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
ensure name is a string in -nameInContext:
fix name escaping in -_appendNameAttributeToResponse:
ensure value is a string in _appendValueAttributeToResponse:
remove initWithName:associations:contentElements:
* GSWeb/GSWHTMLDynamicElement.m
respect GNUstep coding standard (curly brackets placement, etc.)
ensure string conversion in -_finishInitialization
rename variables to make code understandable
* GSWeb/GSWConditional.m
respect GNUstep coding standard (curly brackets placement, etc.)
* GSWeb/GSWActionImage.m
respect GNUstep coding standard (curly brackets placement, etc.)
fix secure stuff
ensure string conversion
* GSWeb/GSWActionURL.m
respect GNUstep coding standard (curly brackets placement, etc.)
ensure string conversion
* GSWeb/GSWBody.h
remove uneeded declarations
* GSWeb/GSWBody.m
remove uneeded stuff
fix initWithName:...
* GSWeb.framework/GSWBrowser.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
rename variables to make code understandable
Fix bugs
* GSWeb.framework/GSWFileUpload.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
* GSWeb/GSWFrame.h
remove uneeded declarations
* GSWeb/GSWFrame.m
respect GNUstep coding standard (curly brackets placement, etc.)
clean code
* GSWeb/GSWGenericContainer.h
remove uneeded declarations
change inheritence
* GSWeb/GSWGenericContainer.m
respect GNUstep coding standard (curly brackets placement, etc.)
clean code
* GSWeb/GSWGenericElement.h
remove uneeded declarations
change inheritence
* GSWeb/GSWGenericElement.m
respect GNUstep coding standard (curly brackets placement, etc.)
clean code
* GSWeb/GSWForm.h
remove uneeded declarations
* GSWeb/GSWForm.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
ensure string conversion
* GSWeb/GSWHTMLURLValuedElement.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
ensure string conversion
finish appendAttributesToResponse:inContext implementation
* GSWeb/GSWHyperlink.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
ensure string conversion
* GSWeb/GSWImage.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
* GSWeb/GSWClientSideScript.h
remove uneeded declarations
change inheritence
add -setLanguage
* GSWeb/GSWJavaScript.m
clean and update code
* GSWeb/GSWSubmitButton.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
clean code
* GSWeb/GSWImageButton.m
respect GNUstep coding standard (curly brackets placement, etc.)
use GSWAssignAndRemoveAssociation() in initWithName:associations:template:
* GSWeb/GSWSwitchComponent.m
clean and update code
* GSWeb/GSWJavaScript.m
clean and update code
* GSWeb/GSWContext.m
clean & fix -computeQueryDictionaryWithPath:queryDictionary:otherQueryDictionary:
fix componentActionURL... methods
* GSWeb/GSWHTTPIO.m:
use GSWeb_appendStringWithImpPtr()
* GSWeb/GSWActionURL.h
remove uneeded declarations
* GSWeb/GSWPrivate.h
add GSWeb_objectAtIndexWithImpPtr
* GSWDatabase/WODisplayGroup.m
Don't raise validation exceptions in _qualifierForKey:value:operatorSelector:
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@37899 72102866-910b-0410-8b05-ffd578937521
2014-05-22 11:09:50 +00:00
|
|
|
//--------------------------------------------------------------------
|
|
|
|
NSString* GSWJoinedStrings(int stringsCount,NSString* s1,...)
|
|
|
|
{
|
|
|
|
NSString* result=nil;
|
|
|
|
if (stringsCount>0)
|
|
|
|
{
|
|
|
|
NSMutableString* tmp=nil;
|
|
|
|
//GSODFLog(@"s1=%@",result);
|
|
|
|
if (stringsCount==1)
|
|
|
|
tmp=(NSMutableString*)s1;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
IMP asIMP=NULL;
|
|
|
|
va_list ap;
|
|
|
|
va_start(ap,s1);
|
|
|
|
int i=0;
|
|
|
|
for(i=0;i<stringsCount;i++)
|
|
|
|
{
|
|
|
|
NSString* s=(i==0 ? s1 : va_arg(ap,NSString*));
|
|
|
|
if (s)
|
|
|
|
{
|
|
|
|
if (!tmp)
|
|
|
|
tmp=[NSMutableString string];
|
|
|
|
GSWeb_appendStringWithImpPtr(tmp,&asIMP,s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
va_end(ap);
|
|
|
|
}
|
|
|
|
if (tmp!=nil)
|
|
|
|
result=[NSString stringWithString:tmp];
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|