Directory db is always berkeleydb

wb/lib/wb/src/wb_ldh.cpp

 /* 
- * Proview   $Id: wb_ldh.cpp,v 1.67 2008-02-05 14:53:12 claes Exp $
+ * Proview   $Id: wb_ldh.cpp,v 1.68 2008-04-10 10:39:29 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -1970,9 +1970,12 @@ ldh_WbLoad( ldh_tSession session, char *loadfile, int ignore_oix)
       char server[80];
       pwr_tStatus sts;
       	
+      if ( cdh_NoCaseStrcmp( vwbl->name(), "directory") == 0)
+	volrep = ldh_eVolRep_Db;
+      else {
 	sts = lfu_GetVolumeCnf( (char *)vwbl->name(), &vid, &cid, &volrep, server);
 	if ( EVEN(sts)) return sts;
-      
+      }
       if ( volrep == ldh_eVolRep_Db) {
 	cdh_ToLower( vname, vwbl->name());
 	strcpy( db_name, "$pwrp_db/");

wb/lib/wb/src/wb_lfu.cpp

 /* 
- * Proview   $Id: wb_lfu.cpp,v 1.12 2008-02-27 06:30:57 claes Exp $
+ * Proview   $Id: wb_lfu.cpp,v 1.13 2008-04-10 10:39:29 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -2471,6 +2471,7 @@ pwr_tStatus lfu_GetVolumeCnf( char *name, pwr_tVid *vid, pwr_tCid *cid, ldh_eVol
   pwr_tFileName fname;
   char line[200];
   char vol_array[7][80];
+  int found = 0;
 
   strcpy( fname, load_cNameVolumeList);
   dcli_translate_filename( fname, fname);
@@ -2478,7 +2479,8 @@ pwr_tStatus lfu_GetVolumeCnf( char *name, pwr_tVid *vid, pwr_tCid *cid, ldh_eVol
   *volrep = ldh_eVolRep_Db;
 
   ifstream fpm( fname, ios::in);
-  if ( fpm) {
+  if ( !fpm)
+    return 0;
   
   while ( fpm.getline( line, sizeof(line))) {
     int nr;
@@ -2490,6 +2492,12 @@ pwr_tStatus lfu_GetVolumeCnf( char *name, pwr_tVid *vid, pwr_tCid *cid, ldh_eVol
 		     sizeof(vol_array)/sizeof(vol_array[0]),
 		     sizeof(vol_array[0]), 0);
       
+
+    if ( cdh_NoCaseStrcmp( vol_array[0], name) != 0)
+      continue;
+
+    found = 1;
+
     sts =  cdh_StringToVolumeId( vol_array[1], vid);
     if ( EVEN(sts)) return sts;
 
@@ -2513,8 +2521,8 @@ pwr_tStatus lfu_GetVolumeCnf( char *name, pwr_tVid *vid, pwr_tCid *cid, ldh_eVol
 	  if ( nr > 5)
 	    strcpy( server, vol_array[5]);
 	}
-	  break;
       }
+      break;
     case pwr_eClass_ClassVolume:
       *volrep = ldh_eVolRep_Wbl;
       if ( cdh_NoCaseStrcmp( vol_array[0], name) == 0) {
@@ -2525,14 +2533,17 @@ pwr_tStatus lfu_GetVolumeCnf( char *name, pwr_tVid *vid, pwr_tCid *cid, ldh_eVol
 	  if ( nr > 5)
 	    strcpy( server, vol_array[5]);
 	}
-	  break;
       }
+      break;
     default: ;
     }
+    break;
   }
   fpm.close();
-  }
+
+  if ( found)
     return LFU__SUCCESS;
+  return 0;
 }
 
 pwr_tStatus lfu_ParseDbmsServer( char *server, char *user, char *password,