wb preparation to use detached version in dbs-file version check

wb/lib/wb/src/wb_erep.cpp

@@ -1361,10 +1361,11 @@ void wb_erep::checkVolume( pwr_tStatus *sts, pwr_tVid vid, vector<wb_volcheck> &
     pwr_tCid vol_cid;
     pwr_tTime vol_time;
     pwr_tObjName vol_name;
+    pwr_tUInt32 vol_dvversion;
 
     volumeNameToFilename( sts, (char *)vol->name(), filestr);
 	   
-    *sts = lfu_GetVolume( filestr, vol_name, &vol_vid, &vol_cid, &vol_time);
+    *sts = lfu_GetVolume( filestr, vol_name, &vol_vid, &vol_cid, &vol_time, &vol_dvversion);
     if ( EVEN(*sts)) {
       MsgWindow::message( 'E', "Dbs file not found for volume ", cdh_VolumeIdToString( 0, vid, 0, 0));
       (*err_cnt)++;
@@ -1372,7 +1373,9 @@ void wb_erep::checkVolume( pwr_tStatus *sts, pwr_tVid vid, vector<wb_volcheck> &
     }
 
     vcheck.m_vid = vid;
+    vcheck.m_cid = vol_cid;
     vcheck.m_time = vol_time;
+    vcheck.m_dvversion = vol_dvversion;
     strcpy( vcheck.m_vname, vol->name());
     strcpy( vcheck.m_filename, filestr);
 

wb/lib/wb/src/wb_erep.h

@@ -67,7 +67,9 @@ class wb_volcheck
   char m_vname[80];
   char m_filename[80];
   pwr_tVid m_vid;
+  pwr_tCid m_cid;
   pwr_tTime m_time;
+  pwr_tUInt32 m_dvversion;
 };
 
 class wb_erep

wb/lib/wb/src/wb_lfu.cpp

@@ -2905,7 +2905,8 @@ pwr_tStatus lfu_GetVolume(     	char *filename,
 			       	char *name,
 				pwr_tVid *vid,
 				pwr_tCid *cid,
-				pwr_tTime *time
+				pwr_tTime *time,
+				pwr_tUInt32 *dvversion
 			       	)
 {
   dbs_sEnv dbsenv;
@@ -2924,6 +2925,7 @@ pwr_tStatus lfu_GetVolume(     	char *filename,
   *cid = volume.cid;
   strcpy( name, volume.name);
   *time = volume.time;
+  *dvversion = volume.dvVersion;
   dbs_Close( &sts, &dbsenv);
 
   return 	LFU__SUCCESS;

wb/lib/wb/src/wb_lfu.h

@@ -130,7 +130,8 @@ pwr_tStatus lfu_GetVolume( char *filename,
 			   char *name,
 			   pwr_tVid *vid,
 			   pwr_tCid *cid,
-			   pwr_tTime *time);
+			   pwr_tTime *time,
+			   pwr_tUInt32 *dvversion);
 pwr_tStatus lfu_GetVolumeCnf( char *name, pwr_tVid *vid, pwr_tCid *cid, ldh_eVolRep *volrep,
 			      char *server);
 

wb/lib/wb/src/wb_pkg.cpp

@@ -332,11 +332,12 @@ void pkg_node::checkVolume( char *filename)
   pwr_tCid vol_cid;
   pwr_tTime vol_time;
   char vol_name[80];
+  pwr_tUInt32 vol_dvversion;
   bool found;
   pwr_tStatus sts;
   char fname[200];
 	  
-  sts = lfu_GetVolume( filename, vol_name, &vol_vid, &vol_cid, &vol_time);
+  sts = lfu_GetVolume( filename, vol_name, &vol_vid, &vol_cid, &vol_time, &vol_dvversion);
   if ( EVEN(sts)) throw wb_error(sts);
 
   found = false;