Changeset 741 for TI01-discovery

Timestamp:

31/03/06 19:15:08 (14 years ago)

Author:

selatham

Message:

clear out old harvests and exit when nothing to harvest

File:

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

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

@@ -52 +52 @@
 datacentre_config_file.close()
 
-# The harvested_records directory
-#harvest_home = "/home/tomcat/oai/WEB-INF/harvested_records/www.npm.ac.uk/8080/oai/provider/rsdas/dif"
+if not os.path.isfile(harvest_home + "/*"):
+    print "Nothing to harvest this time from %s" %datacentre
+    sys.exit()
 
 # The directory to put things for a tape backup (should already exist)
@@ -97 +98 @@
 # The file config.properties contains the name=value pair to parse the filename in java oaiProc.jar.
 # Copy the datacentre specific version of config to config.properties file. 
-# e.g. for bodc:-
-#cat bodc_config.properties
-#       #### config.properties #######
-# Define host_OAI as the string that OAI adds to the filenames after harvesting
-# String added by OAI for BODC, SOC, NCAR 
-# BODC = oai%3Agrid.bodc.nerc.ac.uk%3A
-# SOC = oai%3Aoai.noc.soton.ac.uk%3A
-# NCAR = oai%3Aucar.ncar.scd.cdp%3A
-
-#host_OAI=oai%3Agrid.bodc.nerc.ac.uk%3A
-#
-#               ###########
 
 commandline = "cp /usr/local/WSClients/OAIBatch/" + datacentre +"_config.properties /usr/local/WSClients/OAIBatch/config.properties"
@@ -180 +169 @@
     sys.exit("Failed at copying to backup directory %s" %this_backupdir)
         
-    
+#Clear out the original harvest records area
+commandline = "rm -f " +  harvest_home +"/*"
+print "Executing : " + commandline
+status = os.system(commandline)
+if status !=0:
+    sys.exit("Failed at clearing out original harvest records area %s" %harvet_home)
+
 
 print "======================================================"