mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-22 03:01:27 +00:00
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
217 lines
5.8 KiB
Objective-C
217 lines
5.8 KiB
Objective-C
/** GSWString.m - <title>GSWeb: Class GSWString</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>
|
|
**/
|
|
|
|
#include "config.h"
|
|
|
|
RCS_ID("$Id$")
|
|
|
|
#include "GSWeb.h"
|
|
|
|
static Class standardClass = Nil;
|
|
|
|
//====================================================================
|
|
@implementation GSWString
|
|
|
|
//--------------------------------------------------------------------
|
|
+ (void) initialize
|
|
{
|
|
if (self == [GSWString class])
|
|
{
|
|
standardClass=[GSWString class];
|
|
|
|
};
|
|
};
|
|
|
|
//--------------------------------------------------------------------
|
|
-(id)initWithName:(NSString*)aName
|
|
associations:(NSDictionary*)associations
|
|
template:(GSWElement*)template
|
|
{
|
|
if ((self = [super initWithName:nil
|
|
associations:nil
|
|
template:nil]))
|
|
{
|
|
ASSIGN(_value, [associations objectForKey: value__Key]);
|
|
if (_value == nil)
|
|
{
|
|
[NSException raise:NSInvalidArgumentException
|
|
format:@"%s: no 'value' attribute specified.",
|
|
__PRETTY_FUNCTION__];
|
|
}
|
|
ASSIGN(_valueWhenEmpty, [associations objectForKey: valueWhenEmpty__Key]);
|
|
ASSIGN(_escapeHTML, [associations objectForKey: escapeHTML__Key]);
|
|
ASSIGN(_dateFormat, [associations objectForKey: dateFormat__Key]);
|
|
ASSIGN(_numberFormat, [associations objectForKey: numberFormat__Key]);
|
|
ASSIGN(_formatter, [associations objectForKey: formatter__Key]);
|
|
|
|
if (_dateFormat != nil
|
|
|| _numberFormat != nil
|
|
|| _formatter != nil)
|
|
{
|
|
_shouldFormat = YES;
|
|
}
|
|
else
|
|
{
|
|
_shouldFormat = NO;
|
|
}
|
|
|
|
if ((_dateFormat != nil && _numberFormat != nil)
|
|
|| (_formatter != nil &&
|
|
_dateFormat != nil)
|
|
|| (_formatter != nil && _numberFormat != nil))
|
|
{
|
|
|
|
[NSException raise:NSInvalidArgumentException
|
|
format:@"%s: Cannot have 'dateFormat' and 'numberFormat' attributes at the same time.",
|
|
__PRETTY_FUNCTION__];
|
|
}
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)dealloc
|
|
{
|
|
DESTROY(_dateFormat);
|
|
DESTROY(_numberFormat);
|
|
DESTROY(_formatter);
|
|
DESTROY(_value);
|
|
DESTROY(_escapeHTML);
|
|
DESTROY(_valueWhenEmpty);
|
|
|
|
[super dealloc];
|
|
}
|
|
|
|
//--------------------------------------------------------------------
|
|
-(NSString*)description
|
|
{
|
|
return [NSString stringWithFormat:@"<%s %p - value=%@ dateFormat=%@ numberFormat=%@ escapeHTML=%@ formatter=%@>",
|
|
object_getClassName(self),
|
|
(void*)self,
|
|
_value,
|
|
_dateFormat,
|
|
_numberFormat,
|
|
_escapeHTML,
|
|
_formatter];
|
|
};
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
|
|
// TODO: put that into a superclass, bulid a cache?
|
|
-(NSFormatter*)formatterForComponent:(GSWComponent*)component
|
|
{
|
|
id formatValue = nil;
|
|
id formatter = nil;
|
|
if (_dateFormat)
|
|
{
|
|
formatValue=[_dateFormat valueInComponent:component];
|
|
if (formatValue)
|
|
formatter=[[[NSDateFormatter alloc]initWithDateFormat:formatValue
|
|
allowNaturalLanguage:YES]autorelease];
|
|
}
|
|
else if (_numberFormat)
|
|
{
|
|
formatValue=[_numberFormat valueInComponent:component];
|
|
if (formatValue)
|
|
{
|
|
//TODO
|
|
/*
|
|
formatter=[[NSNumberFormatter new]autorelease];
|
|
[formatter setFormat:formatValue];
|
|
*/
|
|
};
|
|
}
|
|
else
|
|
{
|
|
formatter=[_formatter valueInComponent:component];
|
|
};
|
|
return formatter;
|
|
};
|
|
|
|
|
|
//--------------------------------------------------------------------
|
|
-(void)appendToResponse:(GSWResponse*)response
|
|
inContext:(GSWContext*)context
|
|
{
|
|
GSWComponent* component = GSWContext_component(context);
|
|
|
|
if (_value == nil)
|
|
{
|
|
NSLog(@"%s:WARNING value binding is nil!", __PRETTY_FUNCTION__);
|
|
}
|
|
else
|
|
{
|
|
NSString* formattedValue=nil;
|
|
id valueValue = [_value valueInComponent:component];
|
|
if (_shouldFormat)
|
|
{
|
|
NSFormatter* formatter=[self formatterForComponent:component];
|
|
if (formatter != nil)
|
|
{
|
|
NS_DURING
|
|
{
|
|
formattedValue=NSStringWithObject([formatter stringForObjectValue:valueValue]);
|
|
}
|
|
NS_HANDLER
|
|
{
|
|
formattedValue = nil;
|
|
NSLog(@"%s: value '%@' of class '%@' cannot be formatted.",
|
|
__PRETTY_FUNCTION__, valueValue, [valueValue class]);
|
|
}
|
|
NS_ENDHANDLER
|
|
}
|
|
}
|
|
else
|
|
formattedValue=NSStringWithObject(valueValue);
|
|
|
|
if ((formattedValue == nil || [formattedValue length] == 0)
|
|
&& _valueWhenEmpty != nil)
|
|
{
|
|
formattedValue = [_valueWhenEmpty valueInComponent:component];
|
|
GSWResponse_appendContentString(response, formattedValue);
|
|
}
|
|
else
|
|
{
|
|
if (formattedValue != nil)
|
|
{
|
|
BOOL flag = YES;
|
|
if (_escapeHTML != nil)
|
|
flag = [_escapeHTML boolValueInComponent:component];
|
|
if (flag)
|
|
GSWResponse_appendContentHTMLConvertString(response, formattedValue);
|
|
else
|
|
GSWResponse_appendContentString(response, formattedValue);
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
@end
|