fix bug in delete

[sfa.git] / sfa / storage / record.py

diff --git a/sfa/storage/record.py b/sfa/storage/record.py
index e164dda..772d672 100644 (file)
--- a/sfa/storage/record.py
+++ b/sfa/storage/record.py
@@ -365,14 +365,14 @@ class SfaRecord(Row):
                     print "     %s: %s" % (key, self[key])
     
     def summary_string(self):
-        return "Record(record_id=%s, hrn=%s, type=%s, auth=%s, pointer=%s)" % \
-                (self.get('record_id'), self.get('hrn'), self.get('type'), self.get('auth'), \
+        return "Record(record_id=%s, hrn=%s, type=%s, authority=%s, pointer=%s)" % \
+                (self.get('record_id'), self.get('hrn'), self.get('type'), self.get('authority'), \
                  self.get('pointer'))
 
     def getdict(self):
         return dict(self)
    
-    def sync(self, verbose=False):
+    def sync(self):
         """ 
         Sync this record with the database.
         """ 
@@ -389,21 +389,18 @@ class SfaRecord(Row):
         existing_records = table.find(filter)
         if not existing_records:
             table.insert(self)
-            if verbose:
-                logger.info("Inserted record: %s" %self.summary_string()) 
         else:
             existing_record = existing_records[0]
             self['record_id'] = existing_record['record_id']
             table.update(self) 
-            if verbose:
-                logger.info("Updated record: %s" % self.summary_string()) 
 
-    def delete(self, verbose=False):
+    def delete(self):
         """
         Remove record from the database.
         """
         from sfa.storage.table import SfaTable
         table = SfaTable()
+        filter = {}
         if self.get('record_id'):
             filter['record_id'] = self.get('record_id')
         if self.get('hrn') and self.get('type'):
@@ -411,11 +408,10 @@ class SfaRecord(Row):
             filter['type'] = self.get('type')
             if self.get('pointer'):
                 filter['pointer'] = self.get('pointer')
-        existing_records = table.find(filter)
-        for record in existing_records:
-            table.remove(record)
-            if verbose:
-                logger.info("Removed record: %s" % self.summary_string())    
+        if filter:
+            existing_records = table.find(filter)
+            for record in existing_records:
+                table.remove(record)
 
 class UserRecord(SfaRecord):