AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-4102 fix ures_getByKeyWithFallback for aliased resources

Browse Source 
X-SVN-Rev: 16603
This commit is contained in:
Vladimir Weinstein 2004-10-22 23:13:12 +00:00
parent 0e772ac85a
commit 09f8ca5624
2 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
icu4c/source/common/uresbund.c
View File

@ -1296,6 +1296,7 @@ ures_getByKeyWithFallback(const UResourceBundle *resB,
Resource res = RES_BOGUS;
/*UResourceDataEntry *realData = NULL;*/
const char *key = inKey;
UResourceBundle *helper = NULL;
if (status==NULL || U_FAILURE(*status)) {
return fillIn;
@ -1320,30 +1321,31 @@ ures_getByKeyWithFallback(const UResourceBundle *resB,
uprv_strcpy(path+resB->fResPathLen, inKey);
myPath = path;
key = inKey;
res = res_findResource(&(dataEntry->fData), dataEntry->fData.rootRes, &myPath, &key);
/*res = res_getTableItemByKey(&(resB->fData), resB->fData.rootRes, &indexR, resTag);*/
if (RES_GET_TYPE(res) == URES_ALIAS && *myPath) {
/* We hit an alias, but we didn't finish following the path. */
/* TODO: Fix this so that complete fallback occurs with aliases. */
res = RES_BOGUS;
break;
}
do {
res = res_findResource(&(dataEntry->fData), dataEntry->fData.rootRes, &myPath, &key);
if (RES_GET_TYPE(res) == URES_ALIAS && *myPath) {
/* We hit an alias, but we didn't finish following the path. */
helper = init_resb_result(&(dataEntry->fData), res, inKey, -1, dataEntry, resB, 0, helper, status);
dataEntry = helper->fData;
}
} while(uprv_strlen(myPath));
}
}
/*const ResourceData *rd = getFallbackData(resB, &key, &realData, &res, status);*/
if(res != RES_BOGUS) {
/* check if resB->fResPath gives the right name here */
return init_resb_result(&(dataEntry->fData), res, inKey, -1, dataEntry, resB, 0, fillIn, status);
fillIn = init_resb_result(&(dataEntry->fData), res, inKey, -1, dataEntry, resB, 0, fillIn, status);
} else {
*status = U_MISSING_RESOURCE_ERROR;
}
} else {
return init_resb_result(&(resB->fResData), res, key, -1, resB->fData, resB, 0, fillIn, status);
fillIn = init_resb_result(&(resB->fResData), res, key, -1, resB->fData, resB, 0, fillIn, status);
}
}
else {
*status = U_RESOURCE_TYPE_MISMATCH;
}
ures_close(helper);
return fillIn;
}

33
icu4c/source/test/cintltst/creststn.c
View File

@ -2287,7 +2287,38 @@ static void TestDirectAccess(void) {
log_err("Second resource does not exist. How did it get here?\n");
}
status = U_ZERO_ERROR;
ures_close(t2);
t2 = ures_open(NULL, "he", &status);
t = ures_getByKeyWithFallback(t2, "calendar", t, &status);
t2 = ures_getByKeyWithFallback(t, "islamic-civil", t2, &status);
t = ures_getByKeyWithFallback(t2, "DateTimePatterns", t, &status);
if(U_SUCCESS(status)) {
log_err("This resource does not exist. How did it get here?\n");
}
status = U_ZERO_ERROR;
ures_close(t2);
t2 = ures_open(NULL, "he", &status);
/* George's fix */
t = ures_getByKeyWithFallback(t2, "calendar", t, &status);
t2 = ures_getByKeyWithFallback(t, "islamic-civil", t2, &status);
t = ures_getByKeyWithFallback(t2, "eras", t, &status);
if(U_FAILURE(status)) {
log_err("Didn't get Eras. I know they are there!\n");
}
status = U_ZERO_ERROR;
ures_close(t2);
t2 = ures_open(NULL, "root", &status);
t = ures_getByKeyWithFallback(t2, "calendar", t, &status);
t2 = ures_getByKeyWithFallback(t, "islamic-civil", t2, &status);
t = ures_getByKeyWithFallback(t2, "DateTimePatterns", t, &status);
if(U_SUCCESS(status)) {
log_err("This resource does not exist. How did it get here?\n");
}
status = U_ZERO_ERROR;
ures_close(t);
ures_close(t2);
}