--- bin/import-strix.pl	2008/06/03 10:10:20	146
+++ bin/import-strix-config.pl	2008/06/17 14:43:39	192
@@ -18,7 +18,7 @@
 
 my $config = Jifty->config->app('strix') or die "need strix config";
 
-my $model = A3C::Model::StrixSite->new;
+my $model = A3C::Model::StrixInstance->new;
 
 my $total = 0;
 
@@ -28,22 +28,22 @@
 	warn "? $path\n" if $debug;
 	return unless m/conf\.php$/;
 
-	$path =~ m{/etc/([^/]+)/conf\.php$} or die "can't find site name in $path";
-	my $site = $1;
+	$path =~ m{/etc/([^/]+)/conf\.php$} or die "can't find instance name in $path";
+	my $instance = $1;
 
 	my $data = A3C::PHP->parse_file( $path );
 
 	warn "# PHP = ", dump( $data ) if $debug;
-	$data->{site} = $site;
+	$data->{instance} = $instance;
 
-	my ($id,$msg) = $model->load_or_create( %$data );
-	Jifty->log->info("$id $site ", $msg || 'ADDED');
-	if ( $id ) {
+	my ($ok,$msg) = $model->load_or_create( %$data );
+	if ( $ok ) {
+		Jifty->log->info("$ok $instance ", $msg || 'ADDED');
 		$total++;
 	} else {
-		Jifty->log->error("can't parse $path: $msg");
+		Jifty->log->error("can't parse $path");
 	}
 
 }}, $config->{dir} );
 
-Jifty->log->info( "$total Strix sites imported" );
+Jifty->log->info( "$total Strix instances imported" );