Changeset 11709

Timestamp:

2006-04-26T14:34:21+12:00 (18 years ago)

Author:

kjdon

Message:

no netscape option any more. no longer bundle netscape

File:

• branches/gsdl-2_70-distribution-branch/gsdl/bin/script/exportcol.pl (modified) (9 diffs)

branches/gsdl-2_70-distribution-branch/gsdl/bin/script/exportcol.pl

@@ -48 +48 @@
     'type' => "string",
     'deft' => "STDERR",
-    'reqd' => "no" },
-      { 'name' => "nonetscape",
-    'desc' => "{exportcol.nonetscape}",
-    'type' => "flag",
     'reqd' => "no" },
       { 'name' => "cdname",
@@ -92 +88 @@
 
     my $xml = 0;
-    my $nonetscape = 0;
 
     my $hashParsingResult = {};
@@ -120 +115 @@
     }
     
-    my $use_netscape = ($nonetscape) ? 0 : 1;
-
     # If $language has been specified, load the appropriate resource bundle
     # (Otherwise, the default resource bundle will be loaded automatically)
@@ -158 +151 @@
     &gsprintf($out, "{exportcol.fail} {exportcol.export_coll_not_installed}\n");
     die "\n";
-    }
-
-    # if we want to use netscape, check that the lanugage pack has been installed. What's best to check? for now, use one of the english image files
-    if ($use_netscape) {
-    my $search_image = &util::filename_cat ($ENV{'GSDLHOME'}, "images", "en", "tsrchgr.gif");
-    if (!-e $search_image) {
-        &gsprintf($out, "{exportcol.fail} {exportcol.lang_pack_not_installed}\n");
-        die "\n";
-    }
     }
 
@@ -269 +253 @@
     my $net32dir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "net32");
     my $net16dir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "net16");
-    my $netscapedir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "netscape");
     my $win32sdir = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "Win32s");
     my $phindjar = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "java", "Phind.jar");
@@ -276 +259 @@
     if ((!-d $imagesdir) || (!-d $macrosdir) || (!-d $mappingsdir) || (!-e $maincfg) ||
     (!-e $serverexe) || (!-e $gssetupexe) || (!-e $setupexe) || (!-d $net32dir) ||
-    (!-d $net16dir) || ($use_netscape && (!-d $netscapedir)) || (!-d $win32sdir) || (!-e $phindjar) ||
+    (!-d $net16dir) || (!-d $win32sdir) || (!-e $phindjar) ||
     (!-e $gsdlcollageappletjar)) {
     &gsprintf($out, "{exportcol.fail} {exportcol.non_exist_files}\n");
@@ -288 +271 @@
     &gsprintf($out, "  $net32dir\n");
     &gsprintf($out, "  $net16dir\n");
-    &gsprintf($out, "  $netscapedir\n") if ($use_netscape);
     &gsprintf($out, "  $win32sdir\n");
     &gsprintf($out, "  $phindjar\n");
@@ -295 +277 @@
     }
 
-    # images. If not using netscape, copy only the top level, not any subdirs
-    if ($use_netscape) {
-    &util::cp_r ($imagesdir, $gsdldir);
-    } else {
-    &util::cp_r_toplevel ($imagesdir, $gsdldir);
-    }
+    &util::cp_r ($imagesdir, $gsdldir);
     &util::cp_r ($macrosdir, $gsdldir);
     &util::cp_r ($mappingsdir, $gsdldir);
@@ -309 +286 @@
     &util::cp_r ($net32dir, $gsdldir);
     &util::cp_r ($net16dir, $gsdldir);
-    &util::cp_r ($netscapedir, $topdir) if ($use_netscape);
     &util::cp_r ($win32sdir, $topdir);
     &util::cp ($phindjar, $binjavadir);
     &util::cp ($gsdlcollageappletjar, $binjavadir);
-
-
-    # if we have netscape 4 bundled, then switch to ns4 compat macro file
-    if ($use_netscape) {
-    my $main_cfg_file = &util::filename_cat($etcdir, "main.cfg");
-    open INFILE, "<$main_cfg_file";
-    open OUTFILE, ">$main_cfg_file.tmp";
-    my $line;
-    while ($line = <INFILE>) {
-        if ($line =~ s/nav_css\.dm/nav_ns4\.dm/) {
-        print OUTFILE $line;
-        last; # stop matching once we have found the line
-        } else {
-        print OUTFILE "$line";
-        }
-    }
-    # continue with no checking
-    while ($line = <INFILE>) {
-        print OUTFILE "$line";
-    }
-    close INFILE;
-    close OUTFILE;
-    &util::mv("$main_cfg_file.tmp", $main_cfg_file);
-    }
 
     # now change the home.dm macro file to a simple version