Changeset 3860 for TI01-discovery

Timestamp:

07/05/08 15:52:04 (11 years ago)

Author:

cbyrom

Message:

Add new function, escapeSpecialCharacters() to PostgresRecord? to correct
the input docs and moles docs - so that they don't feature exposed
apostrophes - to avoid errors when running the PL/SQL stuff.

Location:

TI01-discovery/branches/ingestAutomation-upgrade

Files:

• OAIBatch/PostgresDAO.py (modified) (1 diff)
• OAIBatch/PostgresRecord.py (modified) (5 diffs)
• database/ingest_procedures.sql (modified) (1 diff)

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

@@ -229 +229 @@
         sqlCmd = "SELECT create_document('" + self._record.filename + "', '" + \
             self._record.discovery_id + "', '" + self._record.docType + "', '" + \
-            self._record.originalFormat + "');"      
+            self._record.originalFormat + "');" 
 
         id = db_funcs.runSQLCommand(self._connection, sqlCmd)

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

@@ -14 +14 @@
         from ndgUtils.elementtree import cElementTree
 
-import os, sys, logging
-#from ETxmlView import loadET, nsdumb
+import os, sys, logging, re
 import molesReadWrite as MRW
 from ndgUtils.ndgObject import ndgObject
@@ -64 +63 @@
         self.originalFormat = file(filename).read()
         
+        # escape any apostrophes 
+        self.originalFormat = self.escapeSpecialCharacters(self.originalFormat)
+
         # initialise the various record fields
         self.db_id = None    # the DB ID of the record, for easy reference when it is created
@@ -76 +78 @@
         self.getSpatioTemporalData()
 
+
+    def escapeSpecialCharacters(self, inputString):
+        '''
+        Adjust the input string to escape any characters that would interfere with string or DB
+        operations
+        @param inputString: string to correct
+        @return: corrected string 
+        '''
+        return re.sub(r'\'', '\\\'', inputString)
+    
     
     def doRecordTransforms(self):
@@ -156 +168 @@
         
         logging.info("Transform completed successfully")
-        
-#        f=open(xQueryType + "_doc.xml", 'w')
-#        f.write(output)
-#        f.close()
-            
+
         return output
 
@@ -184 +192 @@
         # now run the appropriate transform and set the attribute
         setattr(self, "_molesFormat", self.doTransform(xqName))
+        
+        # escape any apostrophes
+        self._molesFormat = self.escapeSpecialCharacters(self._molesFormat)
+
         logging.info("moles document created")
         

TI01-discovery/branches/ingestAutomation-upgrade/database/ingest_procedures.sql

@@ -26 +26 @@
 $$
         DECLARE
-                db_id integer := -1;
+                db_id integer;
     BEGIN
         -- This inserts a new document into the DB