Changeset 14028

Timestamp:

2007-04-30T15:53:08+12:00 (17 years ago)

Author:

xiao

Message:

1. Changes made to look for collectionConfig.xml in gs3 mode and collect.cfg in gs2 mode, rather than presumably only for the file collect.cfg. 2. In the method create_images(), update the file collectionConfig.xml for the default images icon.gif and smallicon.gif if the 'create_image' option is set.

File:

• trunk/gsdl/bin/script/buildcol.pl (modified) (5 diffs)

trunk/gsdl/bin/script/buildcol.pl

@@ -33 +33 @@
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
+    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/XML/XPath");
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/plugins");
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/classify");
@@ -48 +49 @@
 no strict 'refs'; # allow filehandles to be variables and vice versa
 no strict 'subs'; # allow barewords (eg STDERR) as function arguments
+
+# used in updating Collectionconfig.xml in create_images()
+use Twig;
 
 my $mode_list =
@@ -215 +219 @@
 my $out;
 
+# used to signify "gs2"(default) or "gs3"
+my $gs_mode = "gs2";
+
 ## @method gsprintf()
 #  Print a string to the screen after looking it up from a locale dependant
@@ -340 +347 @@
     unshift (@INC, "$ENV{'GSDLCOLLECTDIR'}/perllib/plugins");
 
-    # read the configuration file
+    # read the configuration file (for gs2)
     $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collect.cfg");
     my ($collectcfg, $buildtype); 
 
-    if (!-e $configfilename) {
+    if (-e $configfilename) {
+      $collectcfg = &colcfg::read_collect_cfg ($configfilename);
+      $gs_mode = "gs2";  
+    } 
+    else {
+
+      # If it is gs3
+      $configfilename = &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, "etc", "collectionConfig.xml");
+
+      if (!-e $configfilename) {
     &gsprintf($out, "{common.cannot_find_cfg_file}\n", $configfilename) && die;
-    }
-    
-    $collectcfg = &colcfg::read_collect_cfg ($configfilename);
+      }
+      else {
+    $collectcfg = &colcfg::read_collection_cfg_xml ($configfilename);
+    $gs_mode = "gs3";
+      } 
+    }
     
     if ($verbosity !~ /\d+/) {
@@ -600 +619 @@
     system ("$image_script -image_dir \"$imagedir\" -filename ${collection}sm.gif -text \"$collection_name\"");
 
+    if ($gs_mode eq "gs3") { 
+    # update the CollectionConfig.xml file
+    # what we need to do is find in CollectionConfig.xml the two elements with attributes 'icon' and 'smallicon'
+    # and replace the node text with $collection.gif and ${collection}sm.gif respectively. If they don't exist,
+    # create new ones by using the image names.
+
+
+    my $found = 0; my $foundsm = 0;
+    
+    my $twig = XML::Twig->new();
+    $twig->parsefile($configfilename);
+    my $root = $twig->root;
+    my $displayItemList = $root->first_child('displayItemList');
+    my @displayItem = $displayItemList->children('displayItem');
+    foreach my $displayItem (@displayItem) {
+        my $att_value = $displayItem->{'att'}->{'name'};
+        
+        if($att_value eq 'icon') {
+        $found = 1;
+        }
+        elsif ( $att_value eq 'smallicon') {
+        $foundsm = 1;
+        }
+    }
+
+    if ($found eq 0) { print "write icon";
+        my $icon_displayItem_element = XML::Twig::Elt->new('displayItem');
+        $icon_displayItem_element->set_att('name', '$collection.gif');
+        $icon_displayItem_element->set_att('lang', 'en');
+        $icon_displayItem_element->set_text("$collection.gif");
+        $icon_displayItem_element->paste('last_child', $displayItemList);
+    }
+    if ($foundsm eq 0) { 
+        my $smallicon_displayItem_element = XML::Twig::Elt->new('displayItem');
+        $smallicon_displayItem_element->set_att('name', 'smallicon');
+        $smallicon_displayItem_element->set_att('lang', 'en');
+        $smallicon_displayItem_element->set_text("${collection}sm.gif");
+        $smallicon_displayItem_element->paste('last_child', $displayItemList);
+        
+        
+    }
+    open (OUT, ">$configfilename") or die "cannot open file $configfilename for output: $!";
+    #select OUT;
+    $twig->print( \*OUT );
+    close OUT;
+    return;
+    }
+
     # update the collect.cfg configuration file (this will need
     # to be changed when the config file format changes)