Revision 2897
Added by sgarg about 19 years ago
| src/edu/ucsb/nceas/metacat/MetaCatServlet.java | ||
|---|---|---|
| 188 | 188 |
for (int i = 0; i < skins.size(); i++) {
|
| 189 | 189 |
skinName = (String) skins.elementAt(i); |
| 190 | 190 |
skinDirPath = context.getRealPath(CONFIG_DIR + "/skin.configs/" + skinName); |
| 191 |
skinPropertyFile = new File(skinDirPath, skinName + ".config");
|
|
| 191 |
skinPropertyFile = new File(skinDirPath, skinName + ".properties");
|
|
| 192 | 192 |
Properties skinOption = null; |
| 193 | 193 |
try {
|
| 194 | 194 |
skinOption = new Properties(); |
| src/edu/ucsb/nceas/metacat/DBTransform.java | ||
|---|---|---|
| 270 | 270 |
|
| 271 | 271 |
if (MetaCatUtil.skinconfigs.containsKey(qformat)){
|
| 272 | 272 |
Properties skinOptions = (Properties)MetaCatUtil.skinconfigs.get(qformat); |
| 273 |
transformer.setParameter("lsidauthority", skinOptions.getProperty("lsidauthority"));
|
|
| 274 |
transformer.setParameter("registryurl", skinOptions.getProperty("registryurl"));
|
|
| 275 |
transformer.setParameter("registryname", skinOptions.getProperty("registryname"));
|
|
| 276 |
} |
|
| 273 |
|
|
| 274 |
if(skinOptions.getProperty("lsidauthority") != null){
|
|
| 275 |
transformer.setParameter("lsidauthority", skinOptions.getProperty("lsidauthority"));
|
|
| 276 |
} |
|
| 277 |
|
|
| 278 |
if(skinOptions.getProperty("registryurl") != null){
|
|
| 279 |
transformer.setParameter("registryurl", skinOptions.getProperty("registryurl"));
|
|
| 280 |
} |
|
| 281 |
|
|
| 282 |
if(skinOptions.getProperty("registryname") != null){
|
|
| 283 |
transformer.setParameter("registryname", skinOptions.getProperty("registryname"));
|
|
| 284 |
} |
|
| 285 |
} |
|
| 277 | 286 |
|
| 278 | 287 |
if(sessionid != null) |
| 279 | 288 |
{
|
Also available in: Unified diff
Added checks for null pointers and changed the name of the config file