Changeset 26183 for main/trunk/greenstone2/bin/script/g2f-import.pl

Timestamp:

2012-09-13T10:12:59+12:00 (12 years ago)

Author:

ak19

Message:

Committing changes Dr Bainbridge and I made to the g2f-import and g2f-building long ago. Note g2f-import runs both import and export.

File:

• main/trunk/greenstone2/bin/script/g2f-import.pl (modified) (2 diffs)

main/trunk/greenstone2/bin/script/g2f-import.pl

@@ -212 +212 @@
     # readdir
     if (opendir(DIR, $export_dir)) {
-
+        my @xml_files = grep { $_ =~ m/^greenstone-http.*\.xml$/ } readdir(DIR);
         closedir DIR;
+
+        # purge all the (URL,hashID) metadata files that we inserted
+        # into fedora at the end of g2f-buildcol.pl
+        # convert the filenames into fedora-pids
+        # filename = greenstone-http=tmpcol-http-__test1-html.xml -> fpid = greenstone-http:tmpcol-http-__test1.html
+        foreach my $file (@xml_files) {
+        my $fedora_pid = $file;
+        $fedora_pid =~ s/\.xml$//;
+        $fedora_pid =~ s/\=/:/;
+        $fedora_pid =~ s/(.*)-(.*)$/$1.$2/;
+        
+        print STDERR "#### fedora_pid: $fedora_pid\n";
+        &g2futil::run_purge($fedora_pid,$options); # displays error message if first time (nothing to purge)
+        }
+
         my @hash_dirs = &g2futil::get_all_hash_dirs($export_dir,$maxdocs);
 
@@ -246 +261 @@
     print "***\n";
 
-    my $gs_export_opts = "-saveas FedoraMETS -fedora_namespace $pid_namespace -verbosity $verbosity";
-
-    $gs_export_opts .= " -gli" if ($gli);
-
-    $gs_export_opts .= " -language $language" if ($language);
-    $gs_export_opts .= " -collectdir \"$collectdir\"" if ($collectdir);
-    $gs_export_opts .= " -removeold" if ($removeold);
-    $gs_export_opts .= " -maxdocs $maxdocs" if ($maxdocs);
-
-    $gs_export_opts .= " -exportdir \"$export_dir\"";
+    my $gs_export_opts = "-saveas FedoraMETS -fedora_namespace $pid_namespace";
+
+    my $gs_opts = " -verbosity $verbosity";
+    $gs_opts .= " -gli" if ($gli);
+
+    $gs_opts .= " -language $language" if ($language);
+    $gs_opts .= " -collectdir \"$collectdir\"" if ($collectdir);
+    $gs_opts .= " -removeold" if ($removeold);
+    $gs_opts .= " -maxdocs $maxdocs" if ($maxdocs);
+
+    $gs_export_opts .= " $gs_opts -exportdir \"$export_dir\"";
 
     my $gs_export_arguments = "$gs_export_opts $gs_col";
 
     &g2futil::run_cmd("export.pl", $gs_export_arguments, $options);
+
+    print STDERR "**** Just for now, also run Greenstone's import.pl\n";
+# if we have the FedoraMETSPlugIN then we wouldn't have to run import anymore
+    my $gs_import_arguments = "$gs_opts $gs_col";
+
+    &g2futil::run_cmd("import.pl", $gs_import_arguments, $options);
 }