gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-04-23 15:33:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GSWeb.framework/GSWRequest.m

Browse source 
* GSWeb.framework/NSString+HTML.?
   o replaced dictionaryQueryString by dictionaryQueryStringWithEncoding:
   o replaced decodeURL by decodeURLEncoding:
     debugging and coding together with David Ayers


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@20890 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Dave Wetzel 2005-03-10 16:10:03 +00:00
parent eeb2371136
commit c80c54ef29
4 changed files with 75 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-03-10 David Wetzel <dave@turbocat.de>
* GSWeb.framework/GSWRequest.m
* GSWeb.framework/NSString+HTML.?
o replaced dictionaryQueryString by dictionaryQueryStringWithEncoding:
o replaced decodeURL by decodeURLEncoding:
debugging and coding together with David Ayers
2005-01-19 David Wetzel <dave@turbocat.de>
* GSWeb.framework/GSWElementID.m:
o set static SEL to NULL first

11
GSWeb.framework/GSWRequest.m
View file

@ -1329,11 +1329,19 @@ RCS_ID("$Id$")
NSDebugMLLog(@"requests",@"aFormData=%@",aFormData);
NSDebugMLLog(@"requests",@"encoding=%ld",(long)encoding);
#warning we should use ACSII encoding here? dave@turbocat.de
// according to the the standard http://www.w3.org/International/O-URL-code.html,
// URIs are encoded in NSASCIIStringEncoding with escape sequences cooresponding
// to the hexadecimal value of the UTF-8 encoding. Therefore the encoding should
// only be relevant for -dictionaryQueryString and not for formString.
// Yet it seems that browsers do not use UTF-8 consistently but the encoding
// specified by the response.
formString=[[[NSString alloc]initWithData:aFormData
encoding:encoding] autorelease];
NSDebugMLLog(@"requests",@"formString=%@",formString);
tmpFormData=[formString dictionaryQueryString];
tmpFormData=[formString dictionaryQueryStringWithEncoding: encoding];
NSDebugMLLog(@"requests",@"tmpFormData=%@",tmpFormData);
allKeys=[tmpFormData allKeys];
@ -1594,6 +1602,7 @@ RCS_ID("$Id$")
NSData* formData=nil;
LOGObjectFnStart();
formData=[self _formData];
NSDebugMLLog(@"requests",@"formData=%@",formData);
if (formData)
{

11
GSWeb.framework/NSString+HTML.h
View file

@ -76,17 +76,22 @@ GSWEB_EXPORT NSString* baseStringByConvertingFromHTML(NSString* string,
//====================================================================
@interface NSString (HTMLString)
-(NSString*)htmlPlus2Space;
-(NSString*)decodeURL;
-(NSString*)decodeURLEncoding:(NSStringEncoding) encoding;
-(NSString*)encodeURL;
-(NSString*)encodeURLWithValid:(NSString*)valid;
-(NSDictionary*)dictionaryQueryString;
-(NSDictionary*)dictionaryQueryStringWithEncoding: (NSStringEncoding) encoding;
-(NSDictionary*)dictionaryWithSep1:(NSString*)sep1
withSep2:(NSString*)sep2
withOptionUnescape:(BOOL)unescape;
-(NSDictionary*)dictionaryWithSep1:(NSString*)sep1
withSep2:(NSString*)sep2
withOptionUnescape:(BOOL)unescape
forceArray:(BOOL)forceArray;
forceArray:(BOOL)forceArray
encoding:(NSStringEncoding) encoding;
-(BOOL)ismapCoordx:(int*)x
y:(int*)y;
-(NSString*)stringByEscapingHTMLString;

102
GSWeb.framework/NSString+HTML.m
View file

@ -598,54 +598,49 @@ NSString* baseStringByConvertingFromHTML(NSString* string,GSWHTMLConvertingStruc
// escape character is '%' and is followed by 2 hex digits
// representing the octet.
//
-(NSString*)decodeURL
-(NSString*) decodeURLEncoding:(NSStringEncoding) encoding
{
//TODO speed
unichar* unichars=NULL;
unichar uniChar=0;
NSString* voidString=nil;
NSString* temp=nil;
const char* p=NULL;
int uniCharsIndex=0;
NSDebugMLLog(@"low",@"self=%@",self);
voidString=[self htmlPlus2Space];
NSDebugMLLog(@"low",@"voidString=%@",voidString);
unichars=GSAutoreleasedBuffer(sizeof(unichar)*([voidString length]+1));
NSDebugMLLog(@"low",@"[voidString cString]=%s",[voidString cString]);
for (p=[voidString cString];p && *p;p++)
unsigned orglen = [self length];
NSMutableData *new = [NSMutableData dataWithLength: orglen];
const unsigned char *read;
unsigned char *write;
unsigned i,n,l;
read = [self UTF8String];
write = [new mutableBytes];
for (l=0,i=0,n=orglen;i<n;i++,l++)
{
if (*p == '%')
{
//
// 2 hex digits follow...
//
int i=0;
uniChar=0;
for (i=0;p[1] && i<2;i++)
{
p++;
NSDebugMLLog(@"low",@"*p=%c %u",(char)*p,(unsigned int)*p);
uniChar <<= 4;
NSDebugMLLog(@"low",@"uniChar=%x",(unsigned int)uniChar);
if (isdigit(*p))
uniChar+=*p-'0';
else
uniChar+=toupper(*p)-'A'+10;
NSDebugMLLog(@"low",@"uniChar=%x",(unsigned int)uniChar);
};
}
else
uniChar=(unsigned char)*p;
unichars[uniCharsIndex]=uniChar;
uniCharsIndex++;
};
temp=[NSString stringWithCharacters:unichars
length:uniCharsIndex];
NSDebugMLLog(@"low",@"temp=%@",temp);
NSDebugMLLog(@"low",@"temp data=%@",
[temp dataUsingEncoding: [GSWMessage defaultEncoding]]);
return temp;
};
switch (read[i])
{
case '%':
{
unsigned char chh, chl;
chh = read[++i];
chh = isdigit(chh) ? chh - '0' : (toupper(chh) - 'A') + 10;
chl = read[++i];
chl = isdigit(chl) ? chl - '0' : (toupper(chl) - 'A') + 10;
*write++ = (chh << 4)|chl;
break;
}
case '+':
{
*write++ = ' ';
break;
}
default:
{
*write++ = read[i];
}
}
}
[new setLength: l];
return AUTORELEASE([[NSString alloc] initWithData: new
encoding: encoding]);
}
//--------------------------------------------------------------------
@ -678,12 +673,13 @@ NSString* baseStringByConvertingFromHTML(NSString* string,GSWHTMLConvertingStruc
}
//--------------------------------------------------------------------
-(NSDictionary*)dictionaryQueryString
-(NSDictionary*) dictionaryQueryStringWithEncoding: (NSStringEncoding) encoding
{
return [self dictionaryWithSep1:@"&"
withSep2:@"="
withOptionUnescape:YES
forceArray:YES];
forceArray:YES
encoding: encoding];
};
//--------------------------------------------------------------------
@ -694,7 +690,8 @@ NSString* baseStringByConvertingFromHTML(NSString* string,GSWHTMLConvertingStruc
return [self dictionaryWithSep1:sep1
withSep2:sep2
withOptionUnescape:unescape
forceArray:NO];
forceArray:NO
encoding:[GSWMessage defaultEncoding]];
};
//--------------------------------------------------------------------
@ -702,6 +699,7 @@ NSString* baseStringByConvertingFromHTML(NSString* string,GSWHTMLConvertingStruc
withSep2:(NSString*)sep2
withOptionUnescape:(BOOL)unescape
forceArray:(BOOL)forceArray// Put value in array even if there's only one value
encoding:(NSStringEncoding) encoding
{
NSMutableDictionary* pDico=nil;
if ([self length]>0)
@ -723,7 +721,7 @@ NSString* baseStringByConvertingFromHTML(NSString* string,GSWHTMLConvertingStruc
{
key=[listParam objectAtIndex:0];
if (unescape)
key=[key decodeURL];
key=[key decodeURLEncoding: encoding];
}
else if ([listParam count]==2)
{
@ -731,8 +729,8 @@ NSString* baseStringByConvertingFromHTML(NSString* string,GSWHTMLConvertingStruc
value=[listParam objectAtIndex:1];
if (unescape)
{
key=[key decodeURL];
value=[value decodeURL];
key=[key decodeURLEncoding: encoding];
value= [value decodeURLEncoding: encoding];
};
};
if (key)