Changeset 25577 for main/trunk/greenstone2

Timestamp:

2012-05-11T16:40:12+12:00 (12 years ago)

Author:

ak19

Message:

Moved some more general methods from activate.pl to util.pm and in the recently added sub mv_dir_contents, use rmdir to remove empty dirs rather than using rm_r.

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/util.pm

@@ -206 +206 @@
                 # now all content is moved across, delete empty dir in source folder
                 if(&is_dir_empty($file)) {
-                    &rm_r($file); 
+                    if (!rmdir $file) {
+                        print STDERR "util::mv_dir_contents couldn't remove directory $file\n";
+                    } 
                 } else { # error
                     print STDERR "ERROR. util::mv_dir_contents: subfolder $file still non-empty after moving contents to $dest_dir\n";
@@ -1779 +1781 @@
 
 
+# Given the qualified collection name (colgroup/collection), 
+# returns the collection and colgroup parts
+sub get_collection_parts {
+    # http://perldoc.perl.org/File/Basename.html
+    # my($filename, $directories, $suffix) = fileparse($path);
+    # "$directories contains everything up to and including the last directory separator in the $path 
+    # including the volume (if applicable). The remainder of the $path is the $filename."
+    #my ($collection, $colgroup) = &File::Basename::fileparse($qualified_collection);   
+
+    my $qualified_collection = shift(@_); 
+
+    # Since activate.pl can be launched from the command-line, including by a user, 
+    # best not to assume colgroup uses URL-style slashes as would be the case with GLI
+    # Also allow for the accidental inclusion of multiple slashes
+    my ($colgroup, $collection) = split(/[\/\\]+/, $qualified_collection); #split('/', $qualified_collection);
+    
+    if(!defined $collection) {
+        $collection = $colgroup;
+        $colgroup = "";
+    }
+    return ($collection, $colgroup);
+}
+
+# work out the "collectdir/collection" location
+sub resolve_collection_dir {
+    my ($collect_dir, $qualified_collection, $site) = @_; #, $gs_mode
+    
+    my ($colgroup, $collection) = &util::get_collection_parts($qualified_collection);   
+    
+    if (defined $collect_dir) {
+        return &util::filename_cat($collect_dir,$colgroup, $collection);
+    }
+    else {
+        if (defined $site) {
+            return &util::filename_cat($ENV{'GSDL3HOME'},"sites",$site,"collect",$colgroup, $collection);
+        }
+        else {
+            return &util::filename_cat($ENV{'GSDLHOME'},"collect",$colgroup, $collection);
+        }
+    }
+}
+
 1;