Changeset 12629 for trunk/gsdl/bin/script/downloadinfo.pl

Timestamp:

2006-08-31T14:08:40+12:00 (18 years ago)

Author:

mdewsnip

Message:

Merged the "-listall" and "-describeall" code, and made both always produce XML. The format of the XML has changed slightly too.

File:

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

trunk/gsdl/bin/script/downloadinfo.pl

@@ -158 +158 @@
     }
 
-    if ($listall) {
-    my $download_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib","downloaders");
+    if ($listall || $describeall) {
+    my $download_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "perllib", "downloaders");
     if (!opendir (INDIR, $download_dir)) {
         print STDERR "downloadinfo.pl: could not open directory $download_dir\n";
     }
     else {
-        my @download_list = grep (/Download\.pm$/, readdir (INDIR));
+        my @downloader_list = grep (/Download\.pm$/, readdir (INDIR));
         closedir (INDIR);
-        
-        if ($xml) {
-        my $intNumDownloads = scalar(@download_list);
-        
-        print STDERR "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-        print STDERR "<DownloadList length=\"$intNumDownloads\">\n";
-        map { print STDERR "  <DownloadName>$_</DownloadName>\n"; } @download_list;
-        print STDERR "</DownloadList>\n";
+
+        print STDERR "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+        print STDERR "<DownloadList length=\"" . scalar(@downloader_list) . "\">\n";
+        foreach my $downloader (@downloader_list) {
+        $downloader =~ s/\.pm$//;
+        my $downloaderobj = &download::load_download ($downloader);
+        if ($describeall) {
+            $downloaderobj->print_xml_usage(0);
+        }
+        else {
+            $downloaderobj->print_xml_usage(0, 1);
+        }
         }
-        else {
-        print STDERR join(" ",@download_list), "\n";
-        }
-    }
-    }
-    elsif ($describeall) {
-    my $download_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib","downloaders");
-    my @download_list;
-    if (!opendir (INDIR, $download_dir)) {
-        print STDERR "downloadinfo.pl: could not open directory $download_dir\n";
-    }
-    else {
-        @download_list = grep (/Download\.pm$/, readdir (INDIR));
-        closedir (INDIR);
-    }
-    #sort (@download_list);
-    if ($xml) {
-        my $num_download = scalar(@download_list);
-        &PrintUsage::print_xml_header("download", 1);
-        print STDERR "<DownloadInfoList length=\"$num_download\">\n";
-    }
-    foreach my $pl (@download_list) {
-        $pl =~ s/\.pm$//;
-        &print_single_download($pl, $xml, 0);
-    }
-    if ($xml) {
-        print STDERR "</DownloadInfoList>\n";
-    }
-    }
-
+        print STDERR "</DownloadList>\n";
+    }
+    }
     else {
     &print_single_download($download_name, $xml, 1);
     }
 }
+
 
 sub print_single_download {