Changeset 9236

Timestamp:

2005-03-01T15:39:25+13:00 (19 years ago)

Author:

davidb

Message:

Revisions to help exportcol.pl work more smoothly with Applet version of GLI.

File:

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

trunk/gsdl/bin/script/exportcol.pl

@@ -39 +39 @@
     'desc' => "{scripts.language}",
     'type' => "string",
+    'reqd' => "no" },
+      { 'name' => "xml",
+    'desc' => "{scripts.xml}",
+    'type' => "flag",
     'reqd' => "no" },
       { 'name' => "out",
@@ -45 +49 @@
     'deft' => "STDERR",
     'reqd' => "no" },
+      { 'name' => "nonetscape",
+    'desc' => "{exportcol.nonetscape}",
+    'type' => "flag",
+    'reqd' => "no" },
       { 'name' => "cdname",
     'desc' => "{exportcol.cdname}",
@@ -67 +75 @@
 
     my $xml = 0;
+    my $no_netscape = 0;
 
     if (!parsargv::parse(\@ARGV,
@@ -73 +82 @@
              'cdname/.*/', \$cdname,
              'gli', \$gli,
+             'nonetscape', \$no_netscape,
              q^xml^, \$xml)) {
 
@@ -78 +88 @@
     die "\n";
     }
+
+    my $use_netscape = ($no_netscape) ? 0 : 1;
 
     # If $language has been specified, load the appropriate resource bundle
@@ -234 +246 @@
     if ((!-d $imagesdir) || (!-d $macrosdir) || (!-d $mappingsdir) || (!-e $maincfg) ||
     (!-e $serverexe) || (!-e $gssetupexe) || (!-e $setupexe) || (!-d $net32dir) ||
-    (!-d $net16dir) || (!-d $netscapedir) || (!-d $win32sdir) || (!-e $phindjar) ||
+    (!-d $net16dir) || ($use_netscape && (!-d $netscapedir)) || (!-d $win32sdir) || (!-e $phindjar) ||
     (!-e $gsdlcollageappletjar)) {
     &gsprintf($out, "{exportcol.fail} {exportcol.non_exist_files}\n");
@@ -246 +258 @@
     &gsprintf($out, "  $net32dir\n");
     &gsprintf($out, "  $net16dir\n");
-    &gsprintf($out, "  $netscapedir\n");
+    &gsprintf($out, "  $netscapedir\n") if ($use_netscape);
     &gsprintf($out, "  $win32sdir\n");
     &gsprintf($out, "  $phindjar\n");
@@ -262 +274 @@
     &util::cp_r ($net32dir, $gsdldir);
     &util::cp_r ($net16dir, $gsdldir);
-    &util::cp_r ($netscapedir, $topdir);
+    &util::cp_r ($netscapedir, $topdir) if ($use_netscape);
     &util::cp_r ($win32sdir, $topdir);
     &util::cp ($phindjar, $binjavadir);
@@ -326 +338 @@
     }
 
-    &gsprintf($out, "{exportcol.output_dir}\n", $successcolls, $topdir);
+    my $gsdl_home = $ENV{'GSDLHOME'};
+    my $portable_topdir = $topdir;
+    $portable_topdir =~ s/$gsdl_home/\$GSDLHOME/g;
+
+    &gsprintf($out, "{exportcol.output_dir}\n", $successcolls, $portable_topdir);
     &gsprintf($out, "exportcol.pl succeeded:{exportcol.instructions}\n");
     close OUT if $close_out;