Changeset 22421 for main/trunk/greenstone2/bin/script/import.pl

Timestamp:

2010-07-18T16:36:56+12:00 (14 years ago)

Author:

davidb

Message:

Continued work on refactoring code to have better shared support for import.pl and export.pl

File:

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

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

@@ -241 +241 @@
     'range' => "0,",
     # parsearg left "" as default
-    'deft' => "2",
+    # 'deft' => "2",
     'reqd' => "no",
     'modegli' => "3" },
@@ -263 +263 @@
 sub main 
 {
-    my $inexport = new inexport(\@ARGV,$options);
+    my $inexport = new inexport("import",\@ARGV,$options);
     
     my $collection = $inexport->get_collection();
-    my $collect_cfg = $inexport->read_collection_cfg($collection,$options);    
-    $inexport->set_collection_options("import",$collect_cfg);
+    my ($config_filename,$collect_cfg) = $inexport->read_collection_cfg($collection,$options);    
+    $inexport->set_collection_options($collect_cfg);
     
-    my $pluginfo = $inexport->process_files("import",$collect_cfg);
-
-    $inexport->generate_statistics("import",$pluginfo);
+    my $pluginfo = $inexport->process_files($config_filename,$collect_cfg);
+
+    $inexport->generate_statistics($pluginfo);
 }