[GME-commit] GMESRC/GME/XmlBackEnd/SVNCode CmdClient.cpp, 1.3, 1.4 CmdClient.h, 1.3, 1.4 HiClient.cpp, 1.4, 1.5 HiClient.h, 1.3, 1.4

[Log messages of CVS commits]

Update of /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode
In directory escher:/tmp/cvs-serv4083/SVNCode

Modified Files:
	CmdClient.cpp CmdClient.h HiClient.cpp HiClient.h 
Log Message:
CommitSVN performed on the whole directory to make it faster (if UseBulkCommit flag is true in config.opt).
BulkUnLock is not working because sub_unlock( Targets) does not do its job, even though Targets should be able to hold multiple files.
BulkUnlock can be used in CMD SVN mode. (needs testing).



CVS User: Zoltan Molnar, ISIS (zolmol)

Index: CmdClient.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/CmdClient.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CmdClient.h	20 May 2008 20:24:09 -0000	1.3
--- CmdClient.h	23 May 2008 21:58:16 -0000	1.4
***************
*** 49,52 ****
--- 49,53 ----
  	bool         tryLock                ( const std::string& p_file);
  	bool         unLock                 ( const std::string& p_file);
+ 	bool         bulkUnLock             ( const std::vector< std::string>& p_vect);
  	//bool         mkdirWithUpdate        ( const std::string& p_url, const std::string& p_path, const std::string& p_dir); // obsolete
  	bool         mkdirOnServer          ( const std::string& p_path);

Index: HiClient.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/HiClient.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HiClient.cpp	20 May 2008 20:24:09 -0000	1.4
--- HiClient.cpp	23 May 2008 21:58:16 -0000	1.5
***************
*** 231,234 ****
--- 231,249 ----
  }
  
+ bool HiClient::unLock              ( const std::vector< std::string> & p_pathVec)
+ {
+ 	if( p_pathVec.size() == 0) return false;
+ 	log( "unLockVec", p_pathVec.front());
+ 
+ 	Pool reqPool;
+ 	Targets tgts( p_pathVec.front().c_str());
+ 	std::vector< std::string>::const_iterator it = p_pathVec.begin();
+ 	std::vector< std::string>::const_iterator en = p_pathVec.end();
+ 	for( ++it; it != en; ++it)      // safe to perform ++it in the initialize phase, since it's not empty
+ 		tgts.add( (*it).c_str());
+ 
+ 	return sub_unlock( tgts);
+ }
+ 
  bool HiClient::lockableProp        ( const std::string& p_path)
  {

Index: HiClient.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/HiClient.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HiClient.h	20 May 2008 20:24:09 -0000	1.3
--- HiClient.h	23 May 2008 21:58:16 -0000	1.4
***************
*** 31,34 ****
--- 31,35 ----
  	bool tryLock             ( const std::string& p_path);
  	bool unLock              ( const std::string& p_path);
+ 	bool unLock              ( const std::vector< std::string> & p_pathVec);
  	bool lockableProp        ( const std::string& p_path);
  	bool getLatest           ( const std::string& p_path);

Index: CmdClient.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/CmdClient.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CmdClient.cpp	20 May 2008 20:24:09 -0000	1.3
--- CmdClient.cpp	23 May 2008 21:58:16 -0000	1.4
***************
*** 169,172 ****
--- 169,192 ----
  }
  
+ bool CmdClient::bulkUnLock( const std::vector< std::string>& p_vect)
+ {
+ 	std::string files_concat;
+ 	for( int i = 0; i < p_vect.size(); ++i)
+ 	{
+ 		if( !files_concat.empty())
+ 			files_concat += " ";
+ 		files_concat += p_vect[i];
+ 	}
+ 
+ 	// process with unlock command (several target files)
+ 	std::string cmd = command( m_cs_unlock) + files_concat;
+ 	redirect( cmd);
+ 
+ 	int r;
+ 	r = execute( cmd.c_str());
+ 
+ 	return check( r);
+ }
+ 
  bool CmdClient::mkdirOnServer( const std::string& p_path)
  {