if(TP->Tokens->nParameters == 3)
return HaveBstr(TKEY(2));
else {
- if (TP->Tokens->Params[3]->Type == TYPE_LONG)
- return LBstr(TKEY(2)) == TP->Tokens->Params[3]->lvalue;
- else
- return strcmp(Bstr(TKEY(2)),
- TP->Tokens->Params[3]->Start) == 0;
+ if (IS_NUMBER(TP->Tokens->Params[3]->Type))
+ {
+ return LBstr(TKEY(2)) ==
+ GetTemplateTokenNumber(Target,
+ TP,
+ 3,
+ 0);
+ }
+ else {
+ const char *pch;
+ long len;
+
+ GetTemplateTokenString (Target, TP, 3, &pch, &len);
+ return strcmp(Bstr(TKEY(2)), pch) == 0;
+ }
}
}
wcsession *WCC = WC;
if (WCC != NULL) {
- if (TP->Tokens->Params[0]->lvalue == 0) {
+ long n;
+
+ n = GetTemplateTokenNumber(Target, TP, 0, 0);
+ if (n == 0) {
if (WCC->Hdr->HR.Handler != NULL)
UrlBuf = Name = WCC->Hdr->HR.Handler->Name;
}
- else if (TP->Tokens->Params[0]->lvalue == 1) {
+ else if (n == 1) {
UrlBuf = NewStrBuf();
StrBufExtract_token(UrlBuf, WCC->Hdr->HR.ReqLine, 0, '/');
}
if (!HAVE_PARAM(3)) {
return 1;
}
- else if (TP->Tokens->Params[3]->Type == TYPE_STR)
- return ((TP->Tokens->Params[3]->len == StrLength(Pref)) &&
- (strcmp(TP->Tokens->Params[3]->Start, ChrPtr(Pref)) == 0));
+ else if (IS_NUMBER(TP->Tokens->Params[3]->Type))
+ {
+ return StrTol(Pref) == GetTemplateTokenNumber (Target, TP, 3, 0);
+ }
else
- return (StrTol(Pref) == TP->Tokens->Params[3]->lvalue);
+ {
+ const char *pch;
+ long len;
+
+ GetTemplateTokenString(Target, TP, 3, &pch, &len);
+
+ return ((len == StrLength(Pref)) &&
+ (strcmp(pch, ChrPtr(Pref)) == 0));
+ }
}
int ConditionalHasPreference(StrBuf *Target, WCTemplputParams *TP)
if (TP->Tokens->nParameters == 3) {
return 1;
}
- else if (TP->Tokens->Params[3]->Type == TYPE_STR)
- return (strcmp(TP->Tokens->Params[3]->Start, ChrPtr(Buf)) == 0);
- else return (StrTol(Buf) == TP->Tokens->Params[3]->lvalue);
+ else if (IS_NUMBER(TP->Tokens->Params[3]->Type))
+ return (StrTol(Buf) == GetTemplateTokenNumber (Target, TP, 3, 0));
+ else
+ {
+ const char *pch;
+ long len;
+
+ GetTemplateTokenString(Target, TP, 3, &pch, &len);
+
+ return ((len == StrLength(Buf)) &&
+ (strcmp(pch, ChrPtr(Buf)) == 0));
+ }
+
}
else return 0;
}
#define TYPE_INTDEFINE 8
#define MAXPARAM 20
+#define IS_NUMBER(a) ((a == TYPE_LONG) || (a == TYPE_PREFINT) || (a == TYPE_INTDEFINE))
/*
* \brief Values for wcs_type