Changeset 22849 for main

Timestamp:

2010-09-03T17:56:17+12:00 (14 years ago)

Author:

ak19

Message:

Further changes to ticket 152 (movable collectdir. Both export.pl and exportcol.pl--for Export (to other formats) and Write To CD-Rom menu options, respectively--are now given a collectdir parameter so exporting can work for collections in non-standard collect directories.

Location:

main/trunk/greenstone2

Files:

• bin/script/exportcol.pl (modified) (7 diffs)
• perllib/strings.properties (modified) (1 diff)

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

@@ -51 +51 @@
     'deft' => "exported_collections",
     'reqd' => "no" },
+      { 'name' => "collectdir",
+    'desc' => "{exportcol.collectdir}",
+    'type' => "string",
+    # parsearg left "" as default
+    #'deft' => &util::filename_cat ($ENV{'GSDLHOME'}, "collect"),
+    'deft' => "",
+    'reqd' => "no",
+    'hiddengli' => "yes" }, 
       { 'name' => "noinstall",
     'desc' => "{exportcol.noinstall}",
@@ -95 +103 @@
     my $xml = 0;
     my $gli = 0;
+    # the default/fallback for collect directory if none is provided
+    # (no -collectdir option given) is the standard Greenstone collect directory
+    my $collectdir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect");
 
     my $hashParsingResult = {};
@@ -129 +140 @@
     }
     
+    # var collectdir (dir from where selected collections are exported to the CD) 
+    # may have been set at this point if it was specified with -collectdir
+    
     # can have more than one collection name,  
     # if the first extra option is -h, then output the help
@@ -157 +171 @@
     my @valid_coll_list = ();
     foreach my $c (@coll_list) {
-    my $colldir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $c);
+    my $colldir = &util::filename_cat ($collectdir, $c);
     if (! -d $colldir) {
         &gsprintf($out, "{exportcol.coll_not_found}\n", $c, $colldir);
@@ -202 +216 @@
     }
     
-    my $collectdir = &util::filename_cat ($gsdldir, "collect");
-    &util::mk_all_dir ($collectdir);
+    my $newcollectdir = &util::filename_cat ($gsdldir, "collect");
+    &util::mk_all_dir ($newcollectdir);
     my $etcdir = &util::filename_cat ($gsdldir, "etc");
     &util::mk_all_dir ($etcdir);
@@ -304 +318 @@
     foreach my $c (@valid_coll_list) {
     #old directories
-    my $colldir = &util::filename_cat ($ENV{'GSDLHOME'}, "collect", $c);
+    my $colldir = &util::filename_cat ($collectdir, $c);
     my $colindexdir = &util::filename_cat ($colldir, "index");
     my $coletcdir = &util::filename_cat ($colldir, "etc");
@@ -314 +328 @@
     my $colflashdir = &util::filename_cat ($colldir, "flash");
 
-    # new coll directory
+    # new collection directory
     # $c might be in a group, for now, copy to the top level.
     my $new_c = $c;
     $new_c =~ s/^.*[\/\\]//; # remove any folder info
-    my $newcoldir = &util::filename_cat ($collectdir, $new_c);
+    my $newcoldir = &util::filename_cat ($newcollectdir, $new_c);
 
     &util::mk_all_dir ($newcoldir);

main/trunk/greenstone2/perllib/strings.properties

@@ -210 +210 @@
 exportcol.cddir:The name of the directory that the CD contents are exported to.
 exportcol.cdname:The name of the CD-ROM -- this is what will appear in the start menu once the CD-ROM is installed.
+exportcol.collectdir:The path of the "collect" directory.
 exportcol.desc:PERL script used to export one or more collections to a Windows CD-ROM. 
 exportcol.noinstall:Create a CD-ROM where the library runs directly off the CD-ROM and nothing is installed on the host computer.