Changeset 16102 for gsdl/trunk/bin

Timestamp:

2008-06-23T10:54:24+12:00 (16 years ago)

Author:

davidb

Message:

Some minor adjustments to ingesting documents into a Fedoar repository: it now descends into all the folders generated in archives/export; and it tests for ImagePlugin (rather than the older ImagePlug) name;

Location:

gsdl/trunk/bin/script

Files:

• g2f-buildcol.pl (modified) (2 diffs)
• g2f-import.pl (modified) (2 diffs)

gsdl/trunk/bin/script/g2f-buildcol.pl

@@ -205 +205 @@
 
     if (opendir(DIR, $export_dir)) {
-    my @hash_dirs = grep { /\.dir$/ } readdir(DIR);
     closedir DIR;
+    ## my @hash_dirs = grep { /\.dir$/ } readdir(DIR);
+    my @hash_dirs = &g2futil::get_all_hash_dirs($export_dir);
 
 
@@ -213 +214 @@
 
         my $docmets_filename 
-        = &util::filename_cat($export_dir,$hd,"docmets.xml");
+        = &util::filename_cat($hd,"docmets.xml");
 
         print STDERR "<Build>\n" if $gli;

gsdl/trunk/bin/script/g2f-import.pl

@@ -204 +204 @@
     if ( -e $export_dir ) {
         print "***\n";
-    print "* Removing existing Greenstone $gs_col objects from Fedora $pid_namespace\n";
+    print "* Updating existing Greenstone $gs_col objects from Fedora $pid_namespace\n";
         print "***\n";
 
     # readdir
     if (opendir(DIR, $export_dir)) {
-        my @hash_dirs = grep { /\.dir$/ } readdir(DIR);
+
         closedir DIR;
-
+        my @hash_dirs = &g2futil::get_all_hash_dirs($export_dir,$maxdocs);
 
         # for each hash dir, purge its respective PID
-        foreach my $hd (@hash_dirs) {
-
-        my $full_hd = &util::filename_cat($export_dir,$hd);
+        foreach my $full_hd (@hash_dirs) {
+
         my $hash_id = &g2futil::get_hash_id($full_hd);
 
@@ -226 +225 @@
 
         if ($dsinfo_status == 0) {
-            print "  $pid being removed.\n";        
+            print "  $pid being updated.\n";        
             &g2futil::run_purge($pid,$options);
         }