Changeset 12640 for trunk/gsdl/bin/script/classinfo.pl

Timestamp:

2006-09-01T11:05:08+12:00 (18 years ago)

Author:

mdewsnip

Message:

Now returns valid XML instead of an error when -listall and -describeall is specified and the directory doesn't exist (usually collection-specific).

File:

• trunk/gsdl/bin/script/classinfo.pl (modified) (1 diff)

trunk/gsdl/bin/script/classinfo.pl

@@ -141 +141 @@
  
     if ($listall || $describeall) {
-    my $class_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "perllib", "classify");
-    if (!opendir (INDIR, $class_dir)) {
-        print STDERR "classinfo.pl: could not open directory $class_dir\n";
+    my $classify_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "perllib", "classify");
+    my @classifier_list = ();
+    if (opendir (INDIR, $classify_dir)) {
+        @classifier_list = grep (/\.pm$/, readdir (INDIR));
+        closedir (INDIR);
     }
-    else {
-        my @classifier_list = grep (/\.pm$/, readdir (INDIR));
-        closedir (INDIR);
 
-        print STDERR "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-        print STDERR "<ClassifyList length=\"" . scalar(@classifier_list) . "\">\n";
-        foreach my $classifier (@classifier_list) {
-        $classifier =~ s/\.pm$//;
-        my $classifierobj = &classify::load_classifier_for_info ($classifier);
-        if ($describeall) {
-            $classifierobj->print_xml_usage(0);
-        }
-        else {
-            $classifierobj->print_xml_usage(0, 1);
-        }
+    print STDERR "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    print STDERR "<ClassifyList length=\"" . scalar(@classifier_list) . "\">\n";
+    foreach my $classifier (@classifier_list) {
+        $classifier =~ s/\.pm$//;
+        my $classifierobj = &classify::load_classifier_for_info ($classifier);
+        if ($describeall) {
+        $classifierobj->print_xml_usage(0);
         }
-        print STDERR "</ClassifyList>\n";
+        else {
+        $classifierobj->print_xml_usage(0, 1);
+        }
     }
+    print STDERR "</ClassifyList>\n";
     }
     else {