2003-03-04 Manuel Guesdon <mguesdon@orange-concept.com>

* GSWeb/GSWInput.m:
		o logs
	* GSWeb/GSWCheckBox.m:
		o logs
		o fix for disabled check box
	* GSWAdaptors/Apache/mod_gsweb.c
		o typo fix


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@16128 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mguesdon 2003-03-04 17:50:45 +00:00
parent 6104dbcda5
commit 3cddc8b06e
4 changed files with 52 additions and 34 deletions

View file

@ -1,3 +1,12 @@
2003-03-04 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb/GSWInput.m:
o logs
* GSWeb/GSWCheckBox.m:
o logs
o fix for disabled check box
* GSWAdaptors/Apache/mod_gsweb.c
o typo fix
2003-03-03 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb/GSWSessionTimeOutManager.m:
o Better handling of lock during exceptions

View file

@ -722,7 +722,7 @@ static const command_rec GSWeb_Commands[] =
NULL, /* argument to include in call */
RSRC_CONF, /* where available */
"ScriptAlias for GSWeb" /* directive description */
);
),
AP_INIT_TAKE1
(
GSWEB_CONF__CONFIG_FILE_PATH, /* directive name */

View file

@ -136,44 +136,47 @@ Bindings
//OK
GSWComponent* component=nil;
BOOL disabledInContext=NO;
BOOL isChecked=NO;
LOGObjectFnStartC("GSWCheckBox");
component=[context component];
disabledInContext=[self disabledInContext:context];
if (!disabledInContext)
NSDebugMLLog(@"gswdync",@"disabledInContext=%d",disabledInContext);
[self appendValueToResponse:response
inContext:context];
[self appendNameToResponse:response
inContext:context];
NSDebugMLLog(@"gswdync",@"_value=%@",_value);
NSDebugMLLog(@"gswdync",@"_selection=%@",_selection);
NSDebugMLLog(@"gswdync",@"_checked=%@",_checked);
if (_value && _selection)
{
BOOL isChecked=NO;
[self appendValueToResponse:response
inContext:context];
[self appendNameToResponse:response
inContext:context];
NSDebugMLLog(@"gswdync",@"_value=%@",_value);
NSDebugMLLog(@"gswdync",@"_selection=%@",_selection);
NSDebugMLLog(@"gswdync",@"_checked=%@",_checked);
if (_value && _selection)
id valueValue=[_value valueInComponent:component];
NSDebugMLLog(@"gswdync",@"valueValue=%@",valueValue);
if (valueValue)
{
id valueValue=[_value valueInComponent:component];
NSDebugMLLog(@"gswdync",@"valueValue=%@",valueValue);
if (valueValue)
id selectionValue=[_selection valueInComponent:component];
NSDebugMLLog(@"gswdync",@"selectionValue=%@",selectionValue);
if (selectionValue)
{
id selectionValue=[_selection valueInComponent:component];
NSDebugMLLog(@"gswdync",@"selectionValue=%@",selectionValue);
if (selectionValue)
{
NSString* valueValueString=[NSString stringWithFormat:@"%@",valueValue];
NSString* selectionValueString=[NSString stringWithFormat:@"%@",selectionValue];
isChecked=SBIsValueEqual(selectionValueString,valueValueString);
};
NSString* valueValueString=[NSString stringWithFormat:@"%@",valueValue];
NSString* selectionValueString=[NSString stringWithFormat:@"%@",selectionValue];
isChecked=SBIsValueEqual(selectionValueString,valueValueString);
};
}
else if (_checked)
isChecked=[self evaluateCondition:_checked
inContext:context];
NSDebugMLLog(@"gswdync",@"isChecked=%s",(isChecked ? "YES" : "NO"));
};
}
else if (_checked)
isChecked=[self evaluateCondition:_checked
inContext:context];
NSDebugMLLog(@"gswdync",@"isChecked=%s",(isChecked ? "YES" : "NO"));
if (isChecked)
[response _appendContentAsciiString:@" checked"];
if (disabledInContext)
[response appendContentString:@" disabled"];
if (isChecked)
[response _appendContentAsciiString:@" checked"];
};
LOGObjectFnStopC("GSWCheckBox");
};

View file

@ -157,12 +157,18 @@
//--------------------------------------------------------------------
-(BOOL)disabledInContext:(GSWContext*)context
{
BOOL isDisabled=NO;
LOGObjectFnStartC("GSWInput");
NSDebugMLLog(@"gswdync",@"_enabled=%@ _disabled=%@",_enabled,_disabled);
if (!WOStrictFlag && _enabled)
return ![self evaluateCondition:_enabled
isDisabled=![self evaluateCondition:_enabled
inContext:context];
else
return [self evaluateCondition:_disabled
inContext:context];
isDisabled=[self evaluateCondition:_disabled
inContext:context];
NSDebugMLLog(@"gswdync",@"isDisabled=%d",isDisabled);
LOGObjectFnStopC("GSWInput");
return isDisabled;
};
@end