Changeset 1839 for trunk/gsdl/perllib/classify.pm

Timestamp:

2001-01-16T11:50:05+13:00 (23 years ago)

Author:

paynter

Message:

Updated classifiers to use the parsearg library instead of ad-hoc
"x=y" style parsing. (Backwards compatability maintained through
a quick hack to the load_classifier function in classfy.pm.)

File:

• trunk/gsdl/perllib/classify.pm (modified) (3 diffs)

trunk/gsdl/perllib/classify.pm

@@ -34 +34 @@
 
 sub load_classifiers {
-    my ($classify_list) = @_;
+    my ($classify_list, $build_dir, $outhandle) = @_;
     my @classify_objects = ();
     
-    my $outhandle = pop (@_);
-
     foreach $classifyoption (@$classify_list) {
 
@@ -44 +42 @@
     my $classname = shift @$classifyoption;
     next unless defined $classname;
-    
+
     # find the classifier
     my $colclassname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'},"perllib/classify", 
@@ -57 +55 @@
     # create the classify object
     my ($classobj);
-    map { $_ = "\"$_\""; } @$classifyoption;
-    my $options = join (",", @$classifyoption, $outhandle);
+
+    # backwards compatability hack: if the classifier options are 
+    # in "x=y" format, convert them to parsearg ("-x y") format.
+    my ($opt, $key, $value);
+    my @newoptions;
+    foreach $opt (@$classifyoption) {
+        if ($opt =~ /^(\w+)=(.*)$/) {
+        push @newoptions, "-$1", $2;
+        } else {
+        push @newoptions, $opt;
+        }
+    }
+    push @newoptions, "-builddir", "$build_dir";
+    push @newoptions, "-outhandle", "$outhandle";
+    push @newoptions, "-verbosity", "2";
+
+    map { $_ = "\"$_\""; } @newoptions;
+    my $options .= join (",", @newoptions);
+
+    # print STDERR "$classname\noptions: $options\n";
     eval ("\$classobj = new \$classname($options)");
     die "$@" if $@;
-    
-    # add this object to the list
+
+        # add this object to the list
     push (@classify_objects, $classobj);
     }