Changeset 2263

Timestamp:

12/03/07 23:34:44 (14 years ago)

Author:

selatham

Message:

nocs config etc.

Location:

TI01-discovery/trunk/ingestAutomation/OAIBatch

Files:

• SpaceTimeIngestFromMOLES.py (modified) (5 diffs)
• nocs_config.properties (modified) (1 diff)
• oai_ingest.py (modified) (1 diff)

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

@@ -32 +32 @@
 def do_insert(Mid,west,south,east,north,startdate,enddate):
         sql = "INSERT INTO spatiotemp (id, coordinates, startdate, enddate) VALUES ( '"+Mid+ "', sbox'(("+west+"d , "+south+"d), ("+east+"d , "+north+"d))', '"+startdate+"', '"+enddate+"');"
-        #sql.replace("'null'",None)
+        sql.replace("nulld","null")
         print sql
         cursor = connection.cursor()
@@ -43 +43 @@
 def do_update(Mid,west,south,east,north,startdate,enddate):
         sql = "UPDATE spatiotemp SET coordinates = sbox'(("+west+"d , "+south+"d), ("+east+"d , "+north+"d))', startdate='"+startdate+"', enddate= '"+enddate+"', update_time= now() WHERE id='"+Mid+"';"
-        #sql.replace("'null'",None)
+        sql.replace("nulld","null")
         print sql
         cursor = connection.cursor()
@@ -71 +71 @@
             no_bbox = False
             no_dates = False
-            east = 0
-            west = 0
-            north = 0
-            south = 0
-            startdate="January 1, 01 BC"
-            enddate="January 1, 01 BC"
+            east = 'null'
+            west = 'null'
+            north = 'null'
+            south = 'null'
+            startdate="null"
+            enddate="null"
             dgMeta=MRW.dgMetadata()
             try:
@@ -192 +192 @@
                 #print "North = %s" %south
 
+            print "west= %s,south %s, east %s, north %s, startdate %s, enddate %s" %(west,south,east,north,startdate,enddate)
             if id_exists( Mid ):
                 print "INFO: doc %s exists, updating\n" %Mid
@@ -197 +198 @@
             else:
                 print "INFO: doc %s does not exist, inserting new record\n" %Mid
+
                 do_insert( Mid, west, south, east, north, startdate, enddate )
             numfilesproc += 1

TI01-discovery/trunk/ingestAutomation/OAIBatch/nocs_config.properties

@@ -16 +16 @@
 namespace noc.soton.ac.uk
 #
+#Say whether this is a full NDG data Provider who uses NDG identifiers etc.
+NDG_dataProvider

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

@@ -213 +213 @@
                     ident=getID(original_filename)
                     if NDG_dataProvider:
-                        molesLocalID = ident.split(":",2)[2]
+                        ident.replace(":","__")
+                        molesLocalID = ident.split("__",2)[2]
                     else:
                         molesLocalID = ident