Index: /gsdl/trunk/bin/script/g2f-buildcol.pl
===================================================================
--- /gsdl/trunk/bin/script/g2f-buildcol.pl	(revision 14959)
+++ /gsdl/trunk/bin/script/g2f-buildcol.pl	(revision 14959)
@@ -0,0 +1,237 @@
+#!/usr/bin/perl -w
+
+BEGIN 
+{
+    if (!defined $ENV{'GSDLHOME'}) {
+	print STDERR "Environment variable GSDLHOME not set.\n";
+	print STDERR "  Have you sourced Greenstone's 'setup.bash' file?\n";
+	exit 1;
+    }
+
+    if (!defined $ENV{'JAVA_HOME'}) {
+	print STDERR "Environment variable JAVA_HOME not set.\n";
+	print STDERR "Needed by Fedora command line scripts.\n";
+	exit 1;
+    }
+
+    $ENV{'FEDORA_HOSTNAME'} = "localhost" if (!defined $ENV{'FEDORA_HOSTNAME'});
+    $ENV{'FEDORA_SERVER_PORT'} = "8080" if (!defined $ENV{'FEDORA_SERVER_PORT'});
+    $ENV{'FEDORA_USER'}     = "fedoraAdmin" if (!defined $ENV{'FEDORA_USER'});
+    $ENV{'FEDORA_PASS'}     = "fedoraAdmin" if (!defined $ENV{'FEDORA_PASS'});
+    $ENV{'FEDORA_PROTOCOL'} = "http" if (!defined $ENV{'FEDORA_PROTOCOL'});
+    $ENV{'FEDORA_PID_NAMESPACE'} = "greenstone" if (!defined $ENV{'FEDORA_PID_NAMESPACE'});
+
+    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/");
+
+}
+
+
+use strict;
+no strict 'refs'; # allow filehandles to be variables and vice versa
+no strict 'subs'; # allow barewords (e.g. STDERR) as function arguments
+
+use util;
+use gsprintf 'gsprintf';
+use printusage;
+use parse2;
+
+use g2futil;
+
+
+my $arguments = 
+    [ 
+      { 'name' => "verbosity",
+	'desc' => "Level of verbosity generated",
+	'type' => "string",
+	'deft' => '1',
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "hostname",
+	'desc' => "Domain hostname of Fedora server",
+	'type' => "string",
+	'deft' => $ENV{'FEDORA_HOSTNAME'},
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "port",
+	'desc' => "Port that the Fedora server is running on.",
+	'type' => "string",
+	'deft' => $ENV{'FEDORA_SERVER_PORT'},
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "username",
+	'desc' => "Fedora admin username",
+	'type' => "string",
+	'deft' => $ENV{'FEDORA_USER'},
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "password",
+	'desc' => "Fedora admin password",
+	'type' => "string",
+	'deft' => $ENV{'FEDORA_PASS'},
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "protocol",
+	'desc' => "Fedora protocol, e.g. 'http' or 'https'",
+	'type' => "string",
+	'deft' => $ENV{'FEDORA_PROTOCOL'},
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "pidnamespace",
+	'desc' => "Fedora prefix for PIDs",
+	'type' => "string",
+	'deft' => $ENV{'FEDORA_PID_NAMESPACE'},
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "gli",
+	'desc' => "",
+	'type' => "flag",
+	'reqd' => "no",
+	'hiddengli' => "yes" },
+      { 'name' => "xml",
+	'desc' => "{scripts.xml}",
+	'type' => "flag",
+	'reqd' => "no",
+	'hiddengli' => "yes" },
+      { 'name' => "removeold",
+	'desc' => "{import.removeold}",
+	'type' => "flag",
+	'reqd' => "no",
+	'modegli' => "3" },
+      { 'name' => "language",
+	'desc' => "{scripts.language}",
+	'type' => "string",
+	'reqd' => "no",
+	'modegli' => "4" },
+      { 'name' => "collectdir",
+	'desc' => "{import.collectdir}",
+	'type' => "string",
+	'deft' => "",
+	'reqd' => "no",
+	'hiddengli' => "yes" }
+      ];
+
+my $prog_options 
+    = { 'name' => "g2fbuildcol.pl",
+	'desc' => "Ingest Greenstone directory of FedoraMETS documents into Fedora",
+	'args' => $arguments };
+
+
+sub main
+{
+    my (@ARGV) = @_;
+
+    my $GSDLHOME = $ENV{'GSDLHOME'};
+
+
+    my $options = {};
+    # general options available to all plugins
+    my $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$options,"allow_extra_options");
+
+    # Something went wrong with parsing
+    if ($intArgLeftinAfterParsing ==-1)
+    {
+	&PrintUsage::print_txt_usage($prog_options, "[options] greenstone-col");
+	die "\n";
+    }
+
+    my $xml = $options->{'xml'};
+    my $gli = $options->{'gli'};
+
+    if ($intArgLeftinAfterParsing != 1)
+    {
+	if ($xml) {
+	    &PrintUsage::print_xml_usage($prog_options);
+	    print "\n";
+	    return;
+	}
+	else {
+	    &PrintUsage::print_txt_usage($prog_options, "[options] greenstone-col");
+	    print "\n";
+	    return;
+	}
+	    
+    }
+
+    my $gs_col = $ARGV[0];
+
+    my $verbosity = $options->{'verbosity'};
+    my $hostname  = $options->{'hostname'};
+    my $port      = $options->{'port'};
+    my $username  = $options->{'username'};
+    my $password  = $options->{'password'};
+    my $protocol  = $options->{'protocol'};
+    my $pid_namespace = $options->{'pidnamespace'};
+
+    # The following are needed in the FedoraMETS plugout
+    $ENV{'FEDORA_HOSTNAME'} = $hostname;
+    $ENV{'FEDORA_SERVER_PORT'} = $port;
+
+    my $collectdir = $options->{'collectdir'};
+
+    if (!$collectdir) {
+	##    my $collect_dir = util::filename_cat($ENV{'GREENSTONE3_HOME'},
+	##					 "web","sites","localsite","collect");
+
+
+	$collectdir = util::filename_cat($ENV{'GSDLHOME'},"collect");
+    }
+
+    my $full_gs_col = util::filename_cat($collectdir,$gs_col);
+
+
+    if (!-e $full_gs_col ) {
+	print STDERR "Unable to find Greenstone collection $full_gs_col\n";
+	exit 1;
+    }
+
+##    my $archives_dir = &util::filename_cat($full_gs_col,"archives");
+    my $export_dir = &util::filename_cat($full_gs_col,"export");
+
+
+    print "***\n";
+    print "* Ingesting Greenstone processed files into Fedora $pid_namespace\n";
+    print "***\n";
+
+    # Following falls foul of Schematron rule checking
+    my $fd_add_prog = "fedora-ingest";
+#    my $fd_add_cmd;
+#    $fd_add_args  = "dir $export_dir O metslikefedora1 $hostname:$port $username $password \\\n";
+#    $fd_add_args .= "  \"Automated_ingest_by_gs2fed.pl\"";
+
+#    &g2futil::run_cmd($fd_add_prog,$fd_add_args,$options);
+
+
+    # => Ingest individually!
+
+    if (opendir(DIR, $export_dir)) {
+	my @hash_dirs = grep { /\.dir$/ } readdir(DIR);
+	closedir DIR;
+
+
+	# for each hash dir, purge its respective PID
+	foreach my $hd (@hash_dirs) {
+
+	    my $docmets_filename 
+		= &util::filename_cat($export_dir,$hd,"docmets.xml");
+
+	    print STDERR "<Build>\n" if $gli;
+
+	    print "Ingesting $docmets_filename\n";
+
+	    &g2futil::run_ingest($docmets_filename,$options);
+	    print STDERR "</Build>\n" if $gli;
+
+	}	    
+    }
+    else {
+	print STDERR "Error: Unable to open directory $export_dir: $!\n";
+	exit;
+    }
+
+
+}
+
+&main(@ARGV);
+
+
+
Index: /gsdl/trunk/bin/script/g2f-import.pl
===================================================================
--- /gsdl/trunk/bin/script/g2f-import.pl	(revision 14959)
+++ /gsdl/trunk/bin/script/g2f-import.pl	(revision 14959)
@@ -0,0 +1,283 @@
+#!/usr/bin/perl -w
+
+BEGIN 
+{
+    if (!defined $ENV{'GSDLHOME'}) {
+	print STDERR "Environment variable GSDLHOME not set.\n";
+	print STDERR "  Have you sourced Greenstone's 'setup.bash' file?\n";
+	exit 1;
+    }
+
+    $ENV{'FEDORA_HOSTNAME'} = "localhost" if (!defined $ENV{'FEDORA_HOSTNAME'});
+    $ENV{'FEDORA_SERVER_PORT'} = "8080" if (!defined $ENV{'FEDORA_SERVER_PORT'});
+    $ENV{'FEDORA_USER'}     = "fedoraAdmin" if (!defined $ENV{'FEDORA_USER'});
+    $ENV{'FEDORA_PASS'}     = "fedoraAdmin" if (!defined $ENV{'FEDORA_PASS'});
+    $ENV{'FEDORA_PROTOCOL'} = "http" if (!defined $ENV{'FEDORA_PROTOCOL'});
+    $ENV{'FEDORA_PID_NAMESPACE'} = "greenstone" if (!defined $ENV{'FEDORA_PID_NAMESPACE'});
+
+    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/");
+}
+
+
+use strict;
+no strict 'refs'; # allow filehandles to be variables and vice versa
+no strict 'subs'; # allow barewords (e.g. STDERR) as function arguments
+
+use util;
+use gsprintf 'gsprintf';
+use printusage;
+use parse2;
+
+
+use g2futil;
+
+
+my $arguments = 
+    [ 
+      { 'name' => "verbosity",
+	'desc' => "Level of verbosity generated",
+	'type' => "string",
+	'deft' => '1',
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "hostname",
+	'desc' => "Domain hostname of Fedora server",
+	'type' => "string",
+	'deft' => $ENV{'FEDORA_HOSTNAME'},
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "port",
+	'desc' => "Port that the Fedora server is running on.",
+	'type' => "string",
+	'deft' => $ENV{'FEDORA_SERVER_PORT'},
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "username",
+	'desc' => "Fedora admin username",
+	'type' => "string",
+	'deft' => $ENV{'FEDORA_USER'},
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "password",
+	'desc' => "Fedora admin password",
+	'type' => "string",
+	'deft' => $ENV{'FEDORA_PASS'},
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "protocol",
+	'desc' => "Fedora protocol, e.g. 'http' or 'https'",
+	'type' => "string",
+	'deft' => $ENV{'FEDORA_PROTOCOL'},
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "pidnamespace",
+	'desc' => "Fedora prefix for PIDs",
+	'type' => "string",
+	'deft' => $ENV{'FEDORA_PID_NAMESPACE'},
+	'reqd' => "no",
+        'hiddengli' => "no" },
+      { 'name' => "maxdocs",
+	'desc' => "{import.maxdocs}",
+	'type' => "int",
+	'reqd' => "no",
+	'range' => "1,",
+	'modegli' => "1" },
+      { 'name' => "gli",
+	'desc' => "",
+	'type' => "flag",
+	'reqd' => "no",
+	'hiddengli' => "yes" },
+      { 'name' => "xml",
+	'desc' => "{scripts.xml}",
+	'type' => "flag",
+	'reqd' => "no",
+	'hiddengli' => "yes" },
+      { 'name' => "removeold",
+	'desc' => "{import.removeold}",
+	'type' => "flag",
+	'reqd' => "no",
+	'modegli' => "3" },
+      { 'name' => "language",
+	'desc' => "{scripts.language}",
+	'type' => "string",
+	'reqd' => "no",
+	'modegli' => "4" },
+      { 'name' => "collectdir",
+	'desc' => "{import.collectdir}",
+	'type' => "string",
+	'deft' => "",
+	'reqd' => "no",
+	'hiddengli' => "yes" },
+
+
+      ];
+
+my $prog_options 
+    = { 'name' => "g2fimport.pl",
+	'desc' => "Generate Fedora METS format using Greenstone document processing capabilities",
+	'args' => $arguments };
+
+
+sub main
+{
+    my (@ARGV) = @_;
+
+    my $GSDLHOME = $ENV{'GSDLHOME'};
+
+
+    my $options = {};
+    # general options available to all plugins
+    my $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$options,"allow_extra_options");
+
+    # Something went wrong with parsing
+    if ($intArgLeftinAfterParsing ==-1)
+    {
+	&PrintUsage::print_txt_usage($prog_options, "[options] greenstone-col");
+	die "\n";
+    }
+
+    my $xml = $options->{'xml'};
+    my $gli = $options->{'gli'};
+
+    if ($intArgLeftinAfterParsing != 1)
+    {
+	if ($xml) {
+	    &PrintUsage::print_xml_usage($prog_options);
+	    print "\n";
+	    return;
+	}
+	else {
+	    &PrintUsage::print_txt_usage($prog_options, "[options] greenstone-col");
+	    print "\n";
+	    return;
+	}
+	    
+    }
+
+    if ($gli) { # the gli wants strings to be in UTF-8
+	&gsprintf::output_strings_in_UTF8; 
+    }
+
+    my $gs_col = $ARGV[0];
+
+    my $verbosity = $options->{'verbosity'};
+    my $hostname  = $options->{'hostname'}; 
+    my $port      = $options->{'port'};
+    my $username  = $options->{'username'};
+    my $password  = $options->{'password'};
+    my $protocol  = $options->{'protocol'};
+    my $pid_namespace = $options->{'pidnamespace'};
+
+    # The following are needed in the FedoraMETS plugout
+    $ENV{'FEDORA_HOSTNAME'} = $hostname;
+    $ENV{'FEDORA_SERVER_PORT'} = $port;
+
+    my $language   = $options->{'language'};
+    my $collectdir = $options->{'collectdir'};
+    my $removeold  = $options->{'removeold'};
+    my $maxdocs    = $options->{'maxdocs'};
+
+    if (!$collectdir) {
+	# Explicitly set one
+
+	##  $collectdir = util::filename_cat($ENV{'GREENSTONE3_HOME'},
+	##			 "web","sites","localsite","collect");
+
+	$collectdir = util::filename_cat($ENV{'GSDLHOME'},"collect");
+
+    }
+
+    my $full_gs_col = util::filename_cat($collectdir,$gs_col);
+
+    if (!-e $full_gs_col ) {
+	print STDERR "Unable to find Greenstone collection $full_gs_col\n";
+	exit 1;
+    }
+
+    my $archives_dir = &util::filename_cat($full_gs_col,"archives");
+    my $export_dir = &util::filename_cat($full_gs_col,"export");
+
+    if ( -e $export_dir ) {
+        print "***\n";
+	print "* Removing 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;
+
+
+	    # for each hash dir, purge its respective PID
+	    foreach my $hd (@hash_dirs) {
+
+		my $full_hd = &util::filename_cat($export_dir,$hd);
+		my $hash_id = &g2futil::get_hash_id($full_hd);
+
+		next if !defined $hash_id;
+
+		my $pid = "$pid_namespace:$gs_col-$hash_id";
+
+		my $dsinfo_status = &g2futil::run_datastore_info($pid,$options);
+
+		if ($dsinfo_status == 0) {
+		    print "  $pid being removed.\n";	    
+		    &g2futil::run_purge($pid,$options);
+		}
+		else {
+		    print "  $pid not present.\n";
+		}
+	    }	    
+	}
+	else {
+	    print STDERR "Error: Unable to open directory $export_dir: $!\n";
+	    exit;
+	}
+    }
+
+    print "***\n";
+    print "* Processing $gs_col into FedoraMETS format\n";
+    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_arguments = "$gs_export_opts $gs_col";
+
+    &g2futil::run_cmd("export.pl", $gs_export_arguments, $options);
+
+
+    print "***\n";
+    print "* Processing $gs_col for GLI \n";
+    print "***\n";
+
+    my $gs_import_opts = "-verbosity $verbosity";
+
+    $gs_import_opts .= " -gli" if ($gli);
+
+    $gs_import_opts .= " -language $language" if ($language);
+    $gs_import_opts .= " -collectdir $collectdir" if ($collectdir);
+    $gs_import_opts .= " -removeold" if ($removeold);
+    $gs_import_opts .= " -maxdocs $maxdocs" if ($maxdocs);
+
+##    $gs_import_opts .= " -archivedir $archive_dir"; # Not needed?
+
+    my $gs_import_arguments = "$gs_import_opts $gs_col";
+
+    &g2futil::run_cmd("import.pl", $gs_import_arguments, $options);
+
+
+}
+
+&main(@ARGV);
+
+
+
