Changeset 1870 in ProjectBuilder for devel/pb/bin

Timestamp:

Apr 10, 2014, 10:50:27 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix #129 by creating a new function pb_connect_db managing onnection to the announces DB and creating it appropriately in all cases (webssh as well)

File:

• devel/pb/bin/pb (modified) (4 diffs)

devel/pb/bin/pb

@@ -4016 +4016 @@
 
     # Store it in DB for external usage (Web pages generation)
-    my $db = "$ENV{'PBCONFDIR'}/announces3.sql";
-
-    my $precmd = "";
-    if (! -f $db) {
-        $precmd = "CREATE TABLE announces (id INTEGER PRIMARY KEY AUTOINCREMENT, date DATE, announce VARCHAR[65535])";
-    }
-
-    my $dbh = DBI->connect("dbi:SQLite:dbname=$db","","",
-                        { RaiseError => 1, AutoCommit => 1 })
-                        || die "Unable to connect to $db";
-
-    if ($precmd ne "") {
-        my $sth = $dbh->prepare(qq{$precmd})
-                    || die "Unable to create table into $db";
-        $sth->execute();
-    }
+    my $dbh = pb_connect_db();
 
     # To read whole file
@@ -4041 +4026 @@
     pb_log(2,"INSERT INTO announces VALUES (NULL, $pbdate, $announce)");
     my $sth = $dbh->prepare(qq{INSERT INTO announces VALUES (NULL,?,?)})
-                    || die "Unable to insert into $db";
+                    || die "Unable to insert into db";
     $sth->execute($pbdate, $announce);
     $sth->finish();
@@ -4115 +4100 @@
     my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");
 
-    # DB of announces for external usage (Web pages generation)
-    my $db = "$ENV{'PBCONFDIR'}/announces3.sql";
-
-    my $dbh = DBI->connect("dbi:SQLite:dbname=$db","","",
-                        { RaiseError => 1, AutoCommit => 1 })
-                        || die "Unable to connect to $db";
+
+    my $dbh = pb_connect_db();
     # For date handling
     $ENV{LANGUAGE}="C";
@@ -4153 +4134 @@
 }
 
+sub pb_connect_db {
+
+    # Store in DB for external usage (Web pages generation)
+    my $db = "$ENV{'PBCONFDIR'}/announces3.sql";
+
+    my $precmd = "";
+    if (! -f $db) {
+        $precmd = "CREATE TABLE announces (id INTEGER PRIMARY KEY AUTOINCREMENT, date DATE, announce VARCHAR[65535])";
+    }
+
+    my $dbh = DBI->connect("dbi:SQLite:dbname=$db","","",
+                        { RaiseError => 1, AutoCommit => 1 })
+                        || die "Unable to connect to $db";
+
+    if ($precmd ne "") {
+        my $sth = $dbh->prepare(qq{$precmd})
+                    || die "Unable to create table into $db";
+        $sth->execute();
+    }
+
+    return($dbh);
+}
+
 
 # Return the SSH key file to use