Changeset 1121 for TI01-discovery

Timestamp:

07/06/06 12:55:18 (15 years ago)

Author:

selatham

Message:

bug fix in copying to backup directories

File:

• TI01-discovery/trunk/ingestAutomation/OAIBatch/oai_ingest.py (modified) (4 diffs)

TI01-discovery/trunk/ingestAutomation/OAIBatch/oai_ingest.py

@@ -148 +148 @@
 # ingest the datacentres records into eXist db (backups of exist happen nightly).
 commandline = "client.sh -c /db/dif/" + datacentre + " -u admin -P xxxxxx -p /usr/local/WSClients/OAIBatch/data/" + datacentre +"/discovery/"
-print "Executing : " + commandline
+#print "Executing : " + commandline
 status = os.system(commandline)
 if status !=0:
@@ -160 +160 @@
 if status !=0:
     sys.exit("Failed at creating backup directory %s" %this_backupdir)
-commandline = "ls -1 /usr/local/WSClients/OAIBatch/data/" + datacentre +"/oai/difcopy/ | xargs -i cp /usr/local/WSClients/OAIBatch/data/" + datacentre +"/oai/difcopy/{\}" + this_backupdir
+
+commandline = "ls -1 /usr/local/WSClients/OAIBatch/data/" + datacentre +"/oai/difcopy/ | xargs -i cp /usr/local/WSClients/OAIBatch/data/" + datacentre +"/oai/difcopy/{\} " + this_backupdir
 print "Executing : " + commandline
 status = os.system(commandline)
@@ -172 +173 @@
 if status !=0:
     sys.exit("Failed at creating backup directory %s" %this_backupdir)
-commandline = "cp " + "/usr/local/WSClients/OAIBatch/data/" + datacentre +"/discovery/* " + this_backupdir
+commandline = "ls -1 /usr/local/WSClients/OAIBatch/data/" + datacentre +"/discovery/ | xargs -i cp /usr/local/WSClients/OAIBatch/data/" + datacentre +"/discovery/{\} " + this_backupdir
 print "Executing : " + commandline
 status = os.system(commandline)
@@ -179 +180 @@
         
 #Clear out the original harvest records area
-commandline = "rm -f " +  harvest_home +"/*"
+commandline = "ls -1 " + harvest_home + " | xargs -i rm -f {\}"
 print "Executing : " + commandline
 status = os.system(commandline)