Changeset 468

Timestamp:

05/10/16 01:19:23 (8 years ago)

Author:

nanardon

Message:

Fix conflict

Files:

• tools/trunk/bin/sophie_load (modified) (1 diff)
• web/lib/Sophie/Controller/Admin.pm (modified) (2 diffs)

tools/trunk/bin/sophie_load

@@ -46 +46 @@
         my $res = $xmlcli->send_request('admin.load_distrib', $string);
         print $res->value . "\n";
+        require Data::Dumper;
+        print Data::Dumper::Dumper($res);
     }
 } else {

web/lib/Sophie/Controller/Admin.pm

@@ -303 +303 @@
 sub add_meta_path : XMLRPC {
     my ($self, $c, $distrib, $meta, $type, $data) = @_;
+    warn "$distrib, $meta, $type";
 
     my ($dist) = 
@@ -388 +389 @@
     }
 
-    #$c->model('Base')->storage->dbh->rollback;
+    $c->model('Base')->storage->dbh->commit;
 }