Changeset 26976

Timestamp:

2013-03-04T17:25:51+13:00 (11 years ago)

Author:

ak19

Message:

First commit for RSS support: copying rss-items.rdf file across from archives to building, so that eventually it will be copied into the index dir as is required.

Location:

main/trunk/greenstone2

Files:

• bin/script/buildcol.pl (modified) (2 diffs)
• perllib/strings.properties (modified) (1 diff)
• perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/bin/script/buildcol.pl

@@ -690 +690 @@
     }
 
+
+    # for RSS support: Need rss-items.rdf file in index folder
+    #  check if a file called rss-items.rdf exists in archives, then copy it into the building folder
+    #  so that when building is moved to index, this file will then also be in index as desired
+    my $collection_dir = &util::resolve_collection_dir($collectdir, $collection, $site);
+    my $rss_items_rdf_file = &util::filename_cat($archivedir, "rss-items.rdf");
+    if(defined $builddir && -d $builddir && -f $rss_items_rdf_file) {
+    &gsprintf($out, "{buildcol.copying_rss_items_rdf}\n") if ($verbosity >= 1);
+    &util::cp ($rss_items_rdf_file, $builddir);
+    }
+
     # if buildcol.pl was run with -activate, need to run activate.pl 
     # now that building's complete  
@@ -716 +727 @@
         }
     }
-    
+    
     close OUT if $close_out;
     close FAILLOG;

main/trunk/greenstone2/perllib/strings.properties

@@ -86 +86 @@
 
 buildcol.copying_back_cached_build:Copying back the cached build
+
+buildcol.copying_rss_items_rdf:Copying rss-items.rdf file from archives to building (eventually to index)
 
 buildcol.create_images:Attempt to create default images for new collection. This relies on the Gimp being installed along with relevant perl modules to allow scripting from perl.

main/trunk/greenstone2/perllib/util.pm

@@ -1843 +1843 @@
     my ($colgroup, $collection) = &util::get_collection_parts($qualified_collection);   
     
-    if (defined $collect_dir) {
+    if (defined $collect_dir && $collect_dir) { # ensure not empty string either
         return &util::filename_cat($collect_dir,$colgroup, $collection);
     }