Changeset 29677 for main/trunk/package-kits

Timestamp:

2015-01-09T13:33:16+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Splitting up site module to allow creating sibling interface module

Location:

main/trunk/package-kits/scripts/perllib/Greenstone

Files:

• Directory.pm (added)
• Site.pm (modified) (2 diffs)
• XML (added)
• XML/Tidy.pm (moved) (moved from main/trunk/package-kits/scripts/perllib/XML/Tidy.pm ) (1 diff)

main/trunk/package-kits/scripts/perllib/Greenstone/Site.pm

@@ -4 +4 @@
 use warnings;
 use utf8;
-use base 'Exporter';
-
-use Greenstone::Config;
-use XML::Tidy;
-
-our $VERSION = 1.00;
-our @EXPORT = ( );
+use Greenstone::Directory;
+use Greenstone::XML::Tidy;
+use parent 'Greenstone::Directory';
+
+my $dir = "sites";
+
+sub new {
+    return Greenstone::Directory::new ($dir, @_);
+}
+
+sub list {
+    return Greenstone::Directory::list $dir;
+}
+
 my $configTemplate;
-
-sub new {
-    my ($class, $name, %args) = @_;
-    ref $class and die "Constructor used as object method\n";
-    defined $name or die "A site must have a name\n";
-    my $self = bless (
-        {
-            name => $name,
-        },
-        $class
-    );
-    for my $param (keys %args) {
-        $self->{$param} = $args{$param};
-    }
-    return $self;
-}
-
-sub list {
-    ref shift and die "Static method called on object\n";
-    my $sites = {};
-    my $dir = "$Greenstone::Config::GSDL3HOME/sites";
-    opendir DH, $dir or die "Could not open sites directory '$dir'\n";
-    while (my $site = readdir DH) {
-        # skip hidden files and current/parent directory
-        $site =~ /^\./ and next;
-        # skip non-directories
-        -d "$dir/$site" or next;
-        # We don't really need to store anything more than the fact that the site exists
-        # So we just store nothing, which is enough to put the key in the hash
-        # (i.e. it acts as a hashset)
-        $sites->{$site} = ();
-    }
-    closedir DH;
-    return $sites;
-}
-
-sub exists {
-    my $self = shift;
-    my $sites = list;
-    return exists $sites->{$self->{name}};
-}
 
 sub create {
     my $self = shift;
-    $self->exists and return 0;
-    my $dir = "$Greenstone::Config::GSDL3HOME/sites/$self->{name}";
-    mkdir $dir or die "Failed to create site directory: $!\n";
+    $self->SUPER::create or return 0;
+    my $dir = $self->dir;
     mkdir "$dir/collect" or die "Failed to create collections directory: $!\n";
     open FH, '>', "$dir/siteConfig.xml" or die "Failed to create site config: $!\n";
@@ -497 +462 @@
 };
 
+1;

main/trunk/package-kits/scripts/perllib/Greenstone/XML/Tidy.pm

@@ -1 @@
-package XML::Tidy;
+package Greenstone::XML::Tidy;
 
 use strict;