Changeset 1898

Timestamp:

19/12/06 19:07:48 (14 years ago)

Author:

selatham

Message:

further ingest work

Location:

TI01-discovery/trunk/ingestAutomation/OAIBatch

Files:

• SpaceTimeIngestFromMOLES.py (modified) (2 diffs)
• oai_ingest.py (modified) (3 diffs)

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

@@ -48 +48 @@
             if filename.find('.xml') != -1:
                 full_filename = indir + "/" + filename
+                no_bbox, no_dates = False
                 dgMeta=MRW.dgMetadata()
                 try:
@@ -56 +57 @@
                 try:
                     bbox=dgMeta.dgMetadataRecord.dgDataEntity.dgDataSummary.dgDataCoverage.dgSpatialCoverage.BoundingBox
+                    print bbox
                 except:
                     print "INFO: XML moles document %s does not contain a bounding box." %full_filename
-
+                    no_bbox=True
                 try:
                     dates=dgMeta.dgMetadataRecord.dgDataEntity.dgDataSummary.dgDataCoverage.dgTemporalCoverage.DateRange
-                except:
-                    print "INFO: XML moles document %s does not contain a bounding box." %full_filename
+                    print dates
+                except:
+                    print "INFO: XML moles document %s does not contain temporal info." %full_filename
+                    no_dates=True
 
-                coverage= [dates.DateRangeEnd, dates.DateRangeStart, bbox.LimitNorth, bbox.LimitSouth,bbox.LimitEast, bbox.LimitWest]
+                if no_bbox and no_dates:
+                    print "INFO: XML moles document %s does not contain any spatiotemporal info." %full_filename
+                    continue
+                #coverage= [dates.DateRangeEnd, dates.DateRangeStart, bbox.LimitNorth, bbox.LimitSouth,bbox.LimitEast, bbox.LimitWest]
                 #Mid = dgMeta.dgMetadataRecord.dgMetadataID.repositoryIdentifier+"__"+dgMeta.dgMetadataRecord.dgMetadataID.localIdentifier
                 Mid = filename
-                print coverage, Mid
+                print Mid
                 #parse the coordinates somewhat
                 #west

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

@@ -27 +27 @@
 import commands
 import string
+import SpaceTimeIngestFromMOLES
 #import oaiClean
 
@@ -178 +179 @@
     print "ERROR: couldn't create the minimum moles records"
     sys.exit
+#are there any records
+outdir = "./DIF2MOLES"
+try:
+    os.stat(outdir)
+except:
+    print "ERROR: couldn't create the minimum moles records for %s" %datacentre
+    sys.exit()
 
 # ingest the created discovery minimum molesrecords into eXist db.
@@ -187 +195 @@
 
 #Extract the spatiotemporal info from created moles and put in Postgres db
-outdir = "./DIF2MOLES"
-try:
-    SpaceTimeIngestFromMOLES.main(outdir)
-except:
-    print "ERROR: SpaceTimeIngestFromMOLES failed. Carrying on to do backups"
+SpaceTimeIngestFromMOLES.main(outdir)
 
 #Make copies of discovery and oai/originals and DIF2MOLES areas to backup area for tape backups