Changeset 71

Timestamp:

11/29/05 13:56:01 (19 years ago)

Author:

thauvin

Message:

• remove use of dir and sqlite

Location:

trunk/soft/ObsData

Files:

• ObsData.pm (modified) (7 diffs, 1 prop)
• bin/obsdata (modified) (1 diff, 1 prop)
• t/O-01.t (modified) (1 diff, 1 prop)
• t/O-02.t (modified) (3 diffs, 1 prop)

trunk/soft/ObsData/ObsData.pm

@@ -6 +6 @@
 use warnings;
 use Config::IniFiles;
-use DBD::SQLite;
 use POSIX qw(strftime);
 use ObsData::Repository;
@@ -51 +50 @@
         verbose => defined($options{verbose}) ? $options{verbose} : 1,
         logcallback => $options{logcallback},
-        dir => $options{dir},
+        logfile => $options{logfile} || "obsdata.log",
     };
 
@@ -61 +60 @@
 
     bless($obsdata, $class);
-
 }
 
@@ -71 +69 @@
         $self->{loghandle} = undef;
     }
-    
 }
 
@@ -77 +74 @@
     my ($self) = @_;
 
-    if (! ($self->{dir} ||= $self->{config}->val('global', 'dir'))) {
-        $self->loging(5, "Data directory not defined", $self->{dir});
-        return 0;
-    }
-    
-    if (! -d $self->{dir}) {
-        $self->loging(5, "Data directory %s does not exists", $self->{dir});
-        return 0;
-    }
-
-    if (!open($self->{loghandle}, ">> $self->{dir}/logs/obsdata.log")) {
+    if (!open($self->{loghandle}, ">> $self->{logfile}")) {
         $self->{loghandle} = undef;
-        $self->loging(5, "Can't open log file %s, exiting", "$self->{dir}/logs/obsdata.log");
+        $self->loging(5, "Can't open log file %s, exiting", "$self->{logfile}");
         return 0;
     }
@@ -100 +87 @@
     my $msg = sprintf($fmt, @val);
     my $logh = $self->{loghandle};
+    if ($self->{logcallback}) {
+        $self->{logcallback}->($level, $msg);
+    }
     if($level >= 0 && $level >= $self->{verbose}) {
-        if ($self->{logcallback}) {
-            $self->{logcallback}->($level, $msg);
-        }
         if ($logh) {
             printf $logh 
@@ -119 +106 @@
     return $loglevel[ $l ] || "?????";
 }
-
-sub init_repository {
-    my ($self) = @_;
-
-    if (!-d $self->{dir}) {
-        mkdir $self->{dir} or return 0;
-    }
-
-    if (!-d "$self->{dir}/logs") {
-        mkdir "$self->{dir}/logs" or return 0;
-    } 
-
-    my $db = DBI->connect("dbi:SQLite:dbname=$self->{dir}/obsdata.db","","",
-        { RaiseError => 1, AutoCommit => 1}
-    ) or return 0;
-
-    $self->load or return 0;
-    $self->loging(1, "Repository succefully created in %s", $self->{dir});
-
-    1;
-}
-
 
 =head2 checkconfig()

trunk/soft/ObsData/bin/obsdata

@@ -8 +8 @@
 use Getopt::Long;
 
+my $verbose = 2;
+
 GetOptions(
     'c=s' => \my $configfile,
-    'd|dir=s' => \my $dir,
+    'logfile=s' => \my $log,
     'i|init' => \my $init,
     'debug' => \my $debug,
+    'v' => sub { $verbose-- },
 );
 
 my $obsdata = ObsData->new(
     $configfile,
-    dir => $dir,
+    logfile => $log,
     verbose => $debug ? 0 : undef,
     logcallback => sub {
+        return if($_[0] < $verbose);
         printf("[%s] %s\n", ObsData::loglevel($_[0]), $_[1]);
     },

trunk/soft/ObsData/t/O-01.t

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 4;
+use Test::More tests => 3;
 
 use_ok('ObsData');
-
-can_ok('ObsData', qw(init_repository));
 
 can_ok('ObsData', qw(list_obs list_obsdatadir list_typedatadir get_datadir getvalue is_obs));

trunk/soft/ObsData/t/O-02.t

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 29;
+use Test::More tests => 26;
 use File::Temp qw(tempdir);
 use POSIX qw(strftime);
@@ -7 +7 @@
 use_ok('ObsData');
 
-my $td = tempdir;
-{
-my $o = ObsData->new(undef, dir => $td);
-ok($o->init_repository($td), "Can initialize repos data");
-ok(-f "$td/obsdata.db", "db is really create");
-ok(-d "$td/logs", "log directory exists");
-}
-
-
-ok(my $o = ObsData->new('testdata/obsdata-conftest', dir => $td), "Can create object");
+ok(my $o = ObsData->new('testdata/obsdata-conftest', logfile => "testdata/obsdata.log"), "Can create object");
 
 # Log level testing
@@ -76 +67 @@
 
 $o = undef; # Explicit destroy
-system("rm -fr $td");