Changeset 12655 for trunk

Timestamp:

03/30/11 16:42:11 (13 years ago)

Author:

sil

Message:

• Fixed several bugs
  • adding objects with m2m-fields did fail
  • search routine in _setfk, fixed filter in for-loop through subfields
  • setting m2m's now done well with multiple filters
• refactored code, and removed obsolete code

File:

• trunk/sara_cmt/sara_cmt/django_cli.py (modified) (9 diffs)

trunk/sara_cmt/sara_cmt/django_cli.py

@@ -167 +167 @@
         # Save object to give it an id, and make the M2M relations
         if not parser.values.DRYRUN:
-            if self.is_complete():
+            try:
                 self.save()
-            else:
-                logger.info('Not enough data provided')
+            except:
+                logger.warning('Not enough data provided')
 
         for m2m in m2ms:
@@ -181 +181 @@
                     self.save()
                     logger.info(save_msg)
-                except (sqlite3.IntegrityError, ValueError), err:
+                except (sqlite3.IntegrityError, ValueError), err: # ??? what if using non-sqlite db? ???
                     logger.error(err)
             else:
@@ -264 +264 @@
         qset = models.query.EmptyQuerySet(model=to_model)
         # OR-filtering QuerySets
+        # !!! TODO: have to use Q-objects for this !!!
         # !!! TODO: have to write a Custom Manager for this !!!
         for subfield in subfields:
@@ -272 +273 @@
                 logger.debug('Iteration done, found: %s (%s)'%(found, type(found)))
                 # higher priority on the label-field:
-                if len(found) == 1 and subfield.name == 'label':
+                if len(found) == 1 and (subfield.name == 'label' or subfield.name == 'name'):
                     qset = found
                     break
@@ -296 +297 @@
             pass
 
-    def _setm2m(self, field, value, subfields=None):
+    def _setm2m(self, field, values, subfields=None):
         """
             Set a ManyToMany-relation.
         """
         to_model = field.rel.to
-        values = value[0].split(',')
         logger.debug("Trying to make M2M-relations to %s based on '%s'" \
-            % (to_model.__name__, value))
+            % (to_model.__name__, values))
 
         # determine which fields should be searched for
@@ -310 +310 @@
             subfields = to_model()._required_local_fields() # exclude FKs
 
-        logger.debug('Searching a %s matching on fields %s' \
-            % (to_model.__name__, [f.name for f in subfields]))
-
         qset = models.query.EmptyQuerySet(model=to_model)
         # OR-filtering QuerySets
         # !!! TODO: have to write a Custom Manager for this !!!
         for subfield in subfields:
-            logger.critical('searching in field: %s' % subfield.name)
+            logger.debug("Searching in field '%s'" % subfield.name)
             qset |= to_model.objects.filter(
                 **{'%s__in' % subfield.name: values})
@@ -332 +329 @@
                 self.__getattribute__(field.name).add(_object)
 
-        logger.critical('value to save: %s' % value)
-
-
         pass
+
 
     def _setattr(self, field, value):
@@ -358 +353 @@
             self._setfk(field, value)
         elif isinstance(field, ManyToManyField):
-            logger.debug('We found a M2M field, but first have to implement \
-                a function to handle this')
-            pass
-            # !!! TODO: Implement M2M relations !!!
+            logger.debug("""Found an M2M field. Can't assign it as long as the" \
+                object doesn't have an id, so leave this for later""")
         else:
             logger.debug('Trying to set attribute of %s'%type(field))
@@ -490 +483 @@
                     self.query[key][attr] = [val]
 
-        logger.debug("push_args built query '%s' from args '%s'" \
-            % (self.query, args))
+        logger.debug("push_args built query '%s'" % self.query)
 
     def get_query(self):