Changeset 22834

Timestamp:

09/09/10 10:57:49 (17 months ago)

Author:

alex

Message:

Back ported change from trunk

File:

• branches/mnw21/pathquery_refactor/intermine/perl/lib/InterMine/ItemFactory.pm (modified) (2 diffs)

branches/mnw21/pathquery_refactor/intermine/perl/lib/InterMine/ItemFactory.pm

@@ -126 +126 @@
 
 =cut
-sub make_item
-{
+sub make_item {
   my $self = shift;
   my %args;
+  my %attr;
 
   if (@_ == 1) {
-    $args{implements} = $_[0];
+    $args{implements} = shift;
+  } elsif (@_ % 2 == 1) {
+      $args{implements} = shift;
+      %attr = @_;
   } else {
     %args = @_;
@@ -139 +142 @@
   $self->{id_counter}++;
 
-  my $classname = '';
-  if (defined $args{classname}) {
-    $classname = $args{classname};
+  $classname  = $args{classname}  || '';
+  $implements = $args{implements} || '';
+
+  my $item = new InterMine::Item(
+      classname  => $classname, 
+      implements => $implements,
+      model      => $self->{model},
+      id         => $self->{id_counter}
+  );
+
+  while (my ($k, $v) = each %attr) {
+      $item->set($k, $v);
   }
 
-  my $implements = '';
-  if (defined $args{implements}) {
-    $implements = $args{implements};
-  }
-
-  return new InterMine::Item(classname => $classname, implements => $implements,
-                             model => $self->{model},
-                             id => $self->{id_counter});
+  return $item;
 }