[extrods] r256 committed - version 1.0

[codesite...@google.com]

Revision: 256
Author: bing...@yahoo.com
Date: Tue Nov 15 00:45:07 2011
Log: version 1.0
http://code.google.com/p/extrods/source/detail?r=256

Modified:
/trunk/CrossZoneRepl/CrossZoneRepl.cpp

=======================================
--- /trunk/CrossZoneRepl/CrossZoneRepl.cpp Tue Nov 1 23:18:38 2011
+++ /trunk/CrossZoneRepl/CrossZoneRepl.cpp Tue Nov 15 00:45:07 2011
@@ -57,9 +57,8 @@
static void write_log(string& str);
static void create_irods_dir(rcComm_t *conn, string & dir_name);
static void debug_msg(string& msg);
-static void info_msg(string& msg);
static int query_source_collection(rcComm_t *conn, RodsEnvClass& srcEnv,
string& topColl, bool recursive, vector<string>& src_files);
-static void print_coll_info(vector<string> & files);
+// static void print_coll_info(vector<string> & files);
static void construct_dest_files(RodsEnvClass& srcEnv, vector<string>&
srcFiles, RodsEnvClass& destEnv, vector<string>& destFiles);
static int replicate_single_file(rcComm_t *srcConn, string& srcFile,
rcComm_t *destConn, string& destFile, string& destResc);
static void PrintUsage(void);
@@ -81,20 +80,19 @@

vector<string> srcFilesToRepl;

- rErrMsg_t errMsg;
rcComm_t *src_conn, *dest_conn;
string config_fname;

string msg;

- int i, t;
+ int t;

string src_node_obj_path;

config_fname = "";
- for(i=0;i <argc; i++) {
+ for(int i=0;i <argc; i++) {
string ts = argv[i];
- if(ts.find("-configfile=") != string::npos) {
+ if(ts.find("-configfile=") != (size_t)string::npos) {
config_fname = ts.substr(12);
}
}
@@ -167,7 +165,7 @@
print_coll_info(destFilenamesWithPath);
*/

- for(i=0; i<srcFilesToRepl.size(); i++) {
+ for(size_t i=0; i<srcFilesToRepl.size(); i++) {
t = replicate_single_file(src_conn, srcFilesToRepl[i], dest_conn,
destFilenamesWithPath[i], destEnv.irodsDefResource);
if(t < 0) {
log_error_code(t);
@@ -213,7 +211,7 @@
debug_msg(msg);

// adding medata into dest file.
- for(int i=0; i<srcUserMetas.size(); i++) {
+ for(size_t i=0; i<srcUserMetas.size(); i++) {
modAVUMetadataInp_t modAVUMetadataInp;
memset(&modAVUMetadataInp, 0, sizeof(modAVUMetadataInp_t));

@@ -575,6 +573,8 @@
}
}
fin.close();
+
+ return 0;
}

static void debug_msg(string& msg)
@@ -585,12 +585,6 @@
write(log_fd, (char *)dmsg.c_str(), dmsg.length());
}
}
-
-static void info_msg(string& msg)
-{
- string infomsg = string("INFO: ") + msg;
- debug_msg(infomsg);
-}

static int query_source_collection(rcComm_t *conn,
RodsEnvClass& srcEnv, string& topColl, bool recursive,
@@ -652,19 +646,21 @@
return 0;
}

+/*
static void print_coll_info(vector<string> & files) {
if(files.size() == 0) {
cerr << "no files found in the source collection.\n";
}

- for(int i=0; i < files.size(); i++) {
+ for(size_t i=0; i < files.size(); i++) {
cerr << files[i] << endl;
}
}
+*/

static void construct_dest_files(RodsEnvClass& srcEnv, vector<string>&
srcFiles, RodsEnvClass& destEnv, vector<string>& destFiles) {
int t = srcEnv.topCollection.length();
- for(int i=0; i< srcFiles.size(); i++) {
+ for(size_t i=0; i< srcFiles.size(); i++) {
string filename = destEnv.topCollection + "/" +
srcFiles[i].substr(t+1);
destFiles.push_back(filename);
}