--

diff --git a/perl/Triple.pm b/perl/Triple.pm
index 2199a7d4f49f20496cf2a2e4ee6b1110907ef468..1df3eeb64c9660c476663842cc6c85117fee710b 100644 (file)
--- a/perl/Triple.pm
+++ b/perl/Triple.pm
@@ -31,18 +31,10 @@ our %static;
 
 our $template = Template->new({INCLUDE_PATH => 'tt'});
 
-sub init_static {
-    foreach (my ($path, @datum) = each %page) {
-        last if $datum[0] == DYNAMIC_PAGE;
-        syslog("info", "Marking Static $path");
-        $template->process($datum[1], $vars, \$_) or syslog("info", $template->error());
-        $static{$path} = $_;
-    }
-}
-
 sub Triple::main {
-    my ($sitename, $version) = preinit();
+    my ($sitename, $version) = init();
     my $request = FCGI::Request();
+
     while($request->Accept() >= 0) {
         my $cgi = CGI->new;
     }
@@ -52,9 +44,8 @@ sub preinit {
 
     sub sitename {
         use Cwd;
-        my $sitename =  getcwd();
-        $sitename =~ s/.*\///;
-        return $sitename;
+        $_ = getcwd();
+        s/.*\///;
     }
 
     sub debug {
@@ -73,8 +64,24 @@ sub preinit {
     my $sitename = sitename();
     debug($sitename);
     my $version = version();
-    syslog("info", "Version $version");
+    syslog("info", "<Triple $version>");
     return $sitename, $version;
 }
 
+sub init {
+
+    sub init_static {
+        foreach (my ($path, @datum) = each %page) {
+            last if $datum[0] == DYNAMIC_PAGE;
+            syslog("info", "Marking Static $path");
+            $template->process($datum[1], $vars, \$_) or syslog("info", $template->error());
+            $static{$path} = $_;
+        }
+    }
+
+    my ($sitename, $version) = preinit();
+
+    init_static();
+}
+
 1;