Revision 5387
Added by berkley about 14 years ago
| DBQuery.java | ||
|---|---|---|
| 1216 | 1216 |
//try merging the data |
| 1217 | 1217 |
ReturnFieldValue existingRFV = |
| 1218 | 1218 |
getArrayValue(parentidList, parentId); |
| 1219 |
if (existingRFV != null) {
|
|
| 1219 |
|
|
| 1220 |
if (existingRFV != null && !existingRFV.getFieldType().equals("ATTRIBUTE")) {
|
|
| 1220 | 1221 |
fielddata = existingRFV.getFieldValue() + fielddata; |
| 1221 | 1222 |
} |
| 1222 | 1223 |
} |
| 1224 |
//System.out.println("fieldname: " + fieldname + " fielddata: " + fielddata);
|
|
| 1223 | 1225 |
value.append("<param name=\"");
|
| 1224 | 1226 |
value.append(fieldname); |
| 1225 | 1227 |
value.append("\">");
|
| ... | ... | |
| 1423 | 1425 |
|
| 1424 | 1426 |
Vector tempVector = null; |
| 1425 | 1427 |
|
| 1426 |
for (int count = 0; count < parentidList.size(); count++) {
|
|
| 1428 |
for (int count = 0; count < parentidList.size(); count++) |
|
| 1429 |
{
|
|
| 1427 | 1430 |
tempVector = (Vector) parentidList.get(count); |
| 1428 | 1431 |
|
| 1429 |
if (key.compareTo((String) tempVector.get(0)) == 0) { return (ReturnFieldValue) tempVector
|
|
| 1430 |
.get(1); } |
|
| 1432 |
if (key.compareTo((String) tempVector.get(0)) == 0) |
|
| 1433 |
{
|
|
| 1434 |
return (ReturnFieldValue) tempVector.get(1); |
|
| 1435 |
} |
|
| 1431 | 1436 |
} |
| 1432 | 1437 |
return null; |
| 1433 | 1438 |
} |
Also available in: Unified diff
fixed bug in metacat that allowed attribute data to be appended to element data in returnfields