Changeset 10225 for trunk/gsdl/bin/script/exportcol.pl

Timestamp:

2005-07-07T09:30:18+12:00 (19 years ago)

Author:

davidb

Message:

cddir minus option put back in. Needed by applet version of GLI.

File:

• trunk/gsdl/bin/script/exportcol.pl (modified) (4 diffs)

trunk/gsdl/bin/script/exportcol.pl

@@ -57 +57 @@
     'type' => "string",
     'deft' => "Greenstone Collections",
-    'reqd' => "no" }, ];
+    'reqd' => "no" }, 
+      { 'name' => "cddir",
+    'desc' => "{exportcol.cddir}",
+    'type' => "string",
+    'deft' => "exported_collections",
+    'reqd' => "no" } ];
 
 my $options = { 'name' => "exportcol.pl",
@@ -80 +85 @@
              'language/.*/', \$language,
              'out/.*/STDERR', \$out,
-             'cdname/.*/', \$cdname,
+             'cdname/.*/Greenstone Collections', \$cdname,
+             'cddir/.*/exported_collections', \$cddir,
              'gli', \$gli,
              'nonetscape', \$no_netscape,
@@ -105 +111 @@
     &gsprintf::output_strings_in_UTF8; 
     }
-    
-    my $dirname=""; 
-    if ($cdname eq "") {
-    $cdname = "Greenstone Collections";
-    $dirname = "exported_collections";
-    } else {
-    $dirname = $cdname;
-    $dirname =~ s/\s//g;
-    $dirname = "exported_".$dirname;
-    }
+
+# No longer needed now -cddir flag also included (with default)    
+#    my $dirname=""; 
+#    if ($cdname eq "") {
+#   $cdname = "Greenstone Collections";
+#   $dirname = "exported_collections";
+#    } else {
+#   $dirname = $cdname;
+#   $dirname =~ s/\s//g;
+#   $dirname = "exported_".$dirname;
+#    }
 
     my @coll_list = @ARGV;
@@ -166 +173 @@
 
     # create exported directory
-    my $topdir = &util::filename_cat ($ENV{'GSDLHOME'}, "tmp", $dirname);
+    my $topdir = &util::filename_cat ($ENV{'GSDLHOME'}, "tmp", $cddir);
     &util::mk_all_dir ($topdir);
     if (!-d $topdir) {