Changeset 29676

Timestamp:

2015-01-09T13:10:56+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Added gs-siteinfo.pl. Lists current sites. Updated site listing code to ignore anything which isn't a site.

Location:

main/trunk/package-kits/scripts

Files:

• gs-siteinfo.pl (added)
• perllib/Greenstone/Site.pm (modified) (4 diffs)

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

@@ -10 +10 @@
 
 our $VERSION = 1.00;
-our @EXPORT = ( 'new', 'get_sites' );
+our @EXPORT = ( );
 my $configTemplate;
 
@@ -29 +29 @@
 }
 
-sub get {
+sub list {
     ref shift and die "Static method called on object\n";
     my $sites = {};
@@ -35 +35 @@
     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
@@ -46 +50 @@
 sub exists {
     my $self = shift;
-    my $sites = get;
+    my $sites = list;
     return exists $sites->{$self->{name}};
 }