Changeset 19791

Timestamp:

2009-06-10T14:36:56+12:00 (15 years ago)

Author:

kjdon

Message:

more changes to do with images moved into web. Now just copy over whole web dir, don't need to do anything with images dir, and don't need to handle Phind.jar and GsdlCollageApplet.jar individually as they are just included in web

File:

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

gsdl/trunk/bin/script/exportcol.pl

@@ -206 +206 @@
     my $etcdir = &util::filename_cat ($gsdldir, "etc");
     &util::mk_all_dir ($etcdir);
-    my $webjavadir = &util::filename_cat ($gsdldir, "web", "java");
-    &util::mk_all_dir ($webjavadir);
 
     #create the config files
@@ -242 +240 @@
     print MANIFESTCFG "\n\n";
     print MANIFESTCFG "collection:\n";
-    print MANIFESTCFG "  collect etc macros mappings bin web images\n";
+    print MANIFESTCFG "  collect etc macros mappings web\n";
     close MANIFESTCFG;
     
@@ -263 +261 @@
     
     # copy the necessary stuff from GSDLHOME
-    my $imagesdir = &util::filename_cat ($ENV{'GSDLHOME'}, "web", "images");
+    my $webdir = &util::filename_cat ($ENV{'GSDLHOME'}, "web");
     my $macrosdir = &util::filename_cat ($ENV{'GSDLHOME'}, "macros");
     my $mappingsdir = &util::filename_cat ($ENV{'GSDLHOME'}, "mappings");
@@ -269 +267 @@
     my $serverexe = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "server.exe");
     my $setupexe = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", "windows", "Setup.exe");
-    my $phindjar = &util::filename_cat ($ENV{'GSDLHOME'}, "web", "java", "Phind.jar");
-    my $gsdlcollageappletjar = &util::filename_cat ($ENV{'GSDLHOME'}, "web", "java", "GsdlCollageApplet.jar");
-
-    if ((!-d $imagesdir) || (!-d $macrosdir) || (!-d $mappingsdir) || (!-e $maincfg) ||
-    (!-e $serverexe) || (!-e $gssetupexe) || (!-e $setupexe) || (!-e $phindjar) ||
-    (!-e $gsdlcollageappletjar)) {
+
+    if ((!-d $webdir) || (!-d $macrosdir) || (!-d $mappingsdir) || (!-e $maincfg) ||
+    (!-e $serverexe) || (!-e $gssetupexe) || (!-e $setupexe)) {
     &gsprintf($out, "{exportcol.fail} {exportcol.non_exist_files}\n");
-    &gsprintf($out, "  $imagesdir\n");
+    &gsprintf($out, "  $webdir\n");
     &gsprintf($out, "  $macrosdir\n");
     &gsprintf($out, "  $mappingsdir\n");
@@ -283 +278 @@
     &gsprintf($out, "  $gssetupexe\n");
     &gsprintf($out, "  $setupexe\n");
-    &gsprintf($out, "  $phindjar\n");
-    &gsprintf($out, "  $gsdlcollageappletjar\n");
-    die "\n";
-    }
-
-    &util::cp_r ($imagesdir, $gsdldir);
+    die "\n";
+    }
+
+    &util::cp_r ($webdir, $gsdldir);
     &util::cp_r ($macrosdir, $gsdldir);
     &util::cp_r ($mappingsdir, $gsdldir);
     &util::cp ($maincfg, $etcdir);
     &util::cp ($serverexe, $gsdldir);
-    &util::cp ($phindjar, $webjavadir);
-    &util::cp ($gsdlcollageappletjar, $webjavadir);
 
     if (!$noinstall) {
@@ -316 +307 @@
     my $colindexdir = &util::filename_cat ($colldir, "index");
     my $coletcdir = &util::filename_cat ($colldir, "etc");
+    my $colmacrosdir = &util::filename_cat ($colldir, "macros");
     my $colimagesdir = &util::filename_cat ($colldir, "images");
-    my $colmacrosdir = &util::filename_cat ($colldir, "macros");
+    my $colscriptdir = &util::filename_cat ($colldir, "script");
+    my $coljavadir = &util::filename_cat ($colldir, "java");
+    my $colstyledir = &util::filename_cat ($colldir, "style");
+    my $colflashdir = &util::filename_cat ($colldir, "flash");
+
     # new coll directory
     my $newcoldir = &util::filename_cat ($collectdir, $c);
@@ -325 +321 @@
     &util::rename_gdbm_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 ($colmacrosdir, $newcoldir) if (-e $colmacrosdir);
+    &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);
 
     # now we need to check the collect.cfg file to make sure it's public