Fixed Nul Error on prepare psycopg2

Sieboldianus · Jun 19, 2018 · e319d58 · e319d58
1 parent 2d686a9
commit e319d58
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/classes/fieldMapping.py b/classes/fieldMapping.py
@@ -164,7 +164,8 @@ def extractPost(self,jsonStringDict, userPkey = None):
         if userRecord:
             self.lbsnRecords.AddRecordsToDict(userRecord)  
         else:
-            self.log.warning(f'Record {self.lbsnRecords.CountGlob}: No User record found for post: {post_guid} (post saved without userid)..')    
+            self.log.warning(f'Record {self.lbsnRecords.CountGlob}: No User record found for post: {post_guid} (post saved without userid)..')   
+            print(f'Record {self.lbsnRecords.CountGlob}', end='\r') 
             #self.log.warning(f'{originalString}') 
             #input("Press Enter to continue... (post will be saved without userid)")
 

diff --git a/classes/helperFunctions.py b/classes/helperFunctions.py
@@ -106,7 +106,7 @@ def null_check(recordAttr):
             return None
         else:
             # This function will also remove Null bytes from string, which aren't supported by Postgres
-            if isinstance(recordAttr, basestring):
+            if isinstance(recordAttr, str):
                 recordAttr = helperFunctions.clean_null_bytes_from_str(recordAttr)
             return recordAttr
 
@@ -140,7 +140,7 @@ def decode_stacked(document, pos=0, decoder=JSONDecoder()):
                 raise
             yield obj
 
-    def clean_null_bytes_from_str(self,str):
+    def clean_null_bytes_from_str(str):
         str_without_null_byte = str.replace('\x00','') 
         return str_without_null_byte            
 
@@ -207,7 +207,11 @@ def MergeExistingRecords(self, newrecord, dict):
                 dict[pkeyID] = self.deepCompareMergeMessages(dict[pkeyID],newrecord)
                 return
         else:
+            # just count new entries
             self.CountGlob += 1
+            if self.CountGlob % 1000 == 0: #modulo
+                print(f'Record {self.CountGlob}', end='\r') 
+                sys.stdout.flush()
         self.update_keyHash(newrecord) # update keyHash only necessary for new record                                                                                          
         dict[pkeyID] = newrecord
 

diff --git a/classes/submitData.py b/classes/submitData.py
@@ -335,11 +335,11 @@ def submitBatch(self,insert_sql):
                                 print(f'TransactionIntegrityError, inserting language "{missingLanguage}" first..')
                                 #self.dbConnection.rollback()
                                 self.dbCursor.execute("ROLLBACK TO SAVEPOINT submit_recordBatch")
-                                insert_sql = '''
+                                insert_language_sql = '''
                                        INSERT INTO "language" (language_short,language_name,language_name_de)
                                        VALUES (%s,NULL,NULL);                                
                                        '''
-                                self.dbCursor.execute(insert_sql,(missingLanguage,))
+                                self.dbCursor.execute(insert_language_sql,(missingLanguage,))
                                 #self.prepareLbsnRecord(record,type_name)
             except ValueError as e:
                 self.log.warning(f'{e}')