Changeset 22459 for main/trunk

Timestamp:

2010-07-21T12:16:18+12:00 (14 years ago)

Author:

davidb

Message:

main() functiion should not try to build collection if not run with a collection name (e.g. run with -xml for GLI to get command line options). If statement added to do this

Location:

main/trunk/greenstone2/bin/script

Files:

• export.pl (modified) (1 diff)
• import.pl (modified) (1 diff)

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

@@ -277 +277 @@
     
     my $collection = $inexport->get_collection();
-    my ($config_filename,$collect_cfg) = $inexport->read_collection_cfg($collection,$options);    
-    $inexport->set_collection_options($collect_cfg);
+
+    if (defined $collection) {
+    my ($config_filename,$collect_cfg) 
+        = $inexport->read_collection_cfg($collection,$options);    
+
+    $inexport->set_collection_options($collect_cfg);
     
-    my $pluginfo = $inexport->process_files($config_filename,$collect_cfg);
-
-    $inexport->generate_statistics($pluginfo);
+    my $pluginfo = $inexport->process_files($config_filename,$collect_cfg);
+    
+    $inexport->generate_statistics($pluginfo);
+    }
 }
 

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

@@ -266 +266 @@
     
     my $collection = $inexport->get_collection();
-    my ($config_filename,$collect_cfg) = $inexport->read_collection_cfg($collection,$options);    
-    $inexport->set_collection_options($collect_cfg);
-    
-    my $pluginfo = $inexport->process_files($config_filename,$collect_cfg);
-
-    $inexport->generate_statistics($pluginfo);
+
+    if (defined $collection) {
+    my ($config_filename,$collect_cfg) 
+        = $inexport->read_collection_cfg($collection,$options);    
+
+    $inexport->set_collection_options($collect_cfg);
+    
+    my $pluginfo = $inexport->process_files($config_filename,$collect_cfg);
+    
+    $inexport->generate_statistics($pluginfo);
+    }
 }