Changeset 21762

Timestamp:

03.03.2010 15:02:08 (5 months ago)

Author:

kjdon

Message:

creating a cd currently copies all svn directories. added a cp_r_nosvn method to util, and use that when copying stuff to cd

Location:

main/trunk/greenstone2

Files:

• bin/script/exportcol.pl (modified) (2 diffs)
• perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/bin/script/exportcol.pl

@@ -281 +281 @@
     }
 
-    &util::cp_r ($webdir, $gsdldir);
-    &util::cp_r ($macrosdir, $gsdldir);
-    &util::cp_r ($mappingsdir, $gsdldir);
+    &util::cp_r_nosvn ($webdir, $gsdldir);
+    &util::cp_r_nosvn ($macrosdir, $gsdldir);
+    &util::cp_r_nosvn ($mappingsdir, $gsdldir);
     &util::cp ($maincfg, $etcdir);
     &util::cp ($serverexe, $gsdldir);
@@ -318 +318 @@
 
         &util::mk_all_dir ($newcoldir);
-        &util::cp_r ($colindexdir, $newcoldir);
+        &util::cp_r_nosvn ($colindexdir, $newcoldir);
         &util::rename_ldb_or_bdb_file(&util::filename_cat ($newcoldir, "index", "text", $c));
-        &util::cp_r ($coletcdir, $newcoldir);
-        &util::cp_r ($colmacrosdir, $newcoldir) if (-e $colmacrosdir);
-        &util::cp_r ($colimagesdir, $newcoldir) if (-e $colimagesdir);
-        &util::cp_r ($colscriptdir, $newcoldir) if (-e $colscriptdir);
-        &util::cp_r ($coljavadir, $newcoldir) if (-e $coljavadir);
-        &util::cp_r ($colstyledir, $newcoldir) if (-e $colstyledir);
-        &util::cp_r ($colflashdir, $newcoldir) if (-e $colflashdir);
+        &util::cp_r_nosvn ($coletcdir, $newcoldir);
+        &util::cp_r_nosvn ($colmacrosdir, $newcoldir) if (-e $colmacrosdir);
+        &util::cp_r_nosvn ($colimagesdir, $newcoldir) if (-e $colimagesdir);
+        &util::cp_r_nosvn ($colscriptdir, $newcoldir) if (-e $colscriptdir);
+        &util::cp_r_nosvn ($coljavadir, $newcoldir) if (-e $coljavadir);
+        &util::cp_r_nosvn ($colstyledir, $newcoldir) if (-e $colstyledir);
+        &util::cp_r_nosvn ($colflashdir, $newcoldir) if (-e $colflashdir);
 
         # now we need to check the collect.cfg file to make sure it's public

main/trunk/greenstone2/perllib/util.pm

@@ -248 +248 @@
     }
 }
+# recursively copies a file or group of files
+# syntax: cp_r (sourcefiles, destination directory)
+# destination must be a directory - to copy one file to
+# another use cp instead
+sub cp_r_nosvn {
+    my $dest = pop (@_);
+    my (@srcfiles) = @_;
+
+    # a few sanity checks
+    if (scalar (@srcfiles) == 0) {
+        print STDERR "util::cp_r no destination directory given\n";
+        return;
+    } elsif (-f $dest) {
+        print STDERR "util::cp_r destination must be a directory\n";
+        return;
+    }
+    
+    # create destination directory if it doesn't exist already
+    if (! -d $dest) {
+        my $store_umask = umask(0002);
+        mkdir ($dest, 0777);
+        umask($store_umask);
+    } 
+
+    # copy the files
+    foreach my $file (@srcfiles) {
+
+        if (!-e $file) {
+            print STDERR "util::cp_r $file does not exist\n";
+
+        } elsif (-d $file) {
+            # make the new directory
+            my ($filename) = $file =~ /([^\\\/]*)$/;
+            $dest = &util::filename_cat ($dest, $filename);
+            my $store_umask = umask(0002);
+            mkdir ($dest, 0777);
+            umask($store_umask);
+
+            # get the contents of this directory
+            if (!opendir (INDIR, $file)) {
+                print STDERR "util::cp_r could not open directory $file\n";
+            } else {
+                my @filedir = readdir (INDIR);
+                closedir (INDIR);
+                foreach my $f (@filedir) {
+                    next if $f =~ /^\.\.?$/;
+                    next if $f =~ /^\.svn$/;
+                    # copy all the files in this directory
+                    my $ff = &util::filename_cat ($file, $f); 
+                    &cp_r ($ff, $dest);
+                }
+            }
+
+        } else {
+            &cp($file, $dest);
+        }
+    }
+}
 
 # copies a directory and its contents, excluding subdirectories, into a new directory