Changeset 3858 for TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/PostgresDAO.py

Timestamp:

07/05/08 12:59:32 (13 years ago)

Author:

cbyrom

Message:

Properly update doc when modifications made + remove redundant code +
handle scn's better.

File:

• TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/PostgresDAO.py (modified) (4 diffs)

TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/PostgresDAO.py

@@ -27 +27 @@
         
 
-    def commavaluesfromsublist(self, list):
-        '''
-        Creates an comma-separated string of values from a list of sublists, taking 
-        the first element of each sublist
-        '''
-        csvString = ""
-        for item in list:
-            if item:
-                if len(csvString) > 0:
-                    csvString += ","    
-                csvString += "%s" % item[0]
-            
-        return csvString
-
-            
     def getRecordID(self):
         '''
@@ -99 +84 @@
         # firstly, check the document is actually new - i.e. not just a repeat of the same data
         if self._checkIsUpdatedRecord():
-        
-            # firstly update the actual documents contained by the record - i.e. the original doc +
+
+            # firstly, update the original record
+            self._updateOriginalRecord()
+        
+            # now update the actual documents contained by the record - i.e. the original doc +
             # the various transforms required
             self._updateMetadataRecords()
@@ -130 +118 @@
         if not results:
             logging.info("Ingested document is different to that in the current DB")
+            # get the current SCN
+            sql = "SELECT scn FROM ORIGINAL_DOCUMENT where original_document_id = " + \
+                    str(self._record.db_id) + ";"
+            results = db_funcs.runSQLCommand(self._connection, sql)
+            self._record.scn = results[0][0]
             return True
             
@@ -255 +248 @@
             self._record.discovery_id + "', '" + self._record.docType + "', '" + \
             self._record.originalFormat + "', '" + str(self._record.scn) + "');"
-
-        id = db_funcs.runSQLCommand(self._connection, sqlCmd)
         db_funcs.runSQLCommand(self._connection, sqlCmd)