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

Timestamp:

2014-06-12T12:20:16+12:00 (10 years ago)

Author:

kjdon

Message:

not sure if we need this catch for collection undefined

File:

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

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

@@ -192 +192 @@
     }
   }
-
+ 
   my $inexport;
   if (defined $inexport_subclass)
@@ -200 +200 @@
     $inexport = new $inexport_subclass("import",\@ARGV,$options);
   }
+ 
   # We don't have a overridden inexport, or the above command failed somehow
   # so load the base inexport class
@@ -208 +209 @@
 
   my $collection = $inexport->get_collection();
-
+  
   if (defined $collection)
   {
@@ -219 +220 @@
 
     $inexport->generate_statistics($pluginfo);
-  }
-
+  } else {
+      # can this actually happen, or will we have died already before getting here
+      print STDERR "collection not defined\n";
+      $inexport->deinit();
+      exit(-1);
+  }
   $inexport->deinit();
 }