Changeset 12248

Timestamp:

2006-07-19T14:57:21+12:00 (18 years ago)

Author:

kjdon

Message:

changed the way the classinfo.pl command is built up - uses an Arraylist not a String []. changed the name of classifier to classifier_combobox, and made it a JComboBox rather than a GComboBox. It is no longer editable. When loading classifiers, it now looks in the collections perllib directory too to get collection specific classifiers. at the moment, cos we still have classifiers.dat, this coll specific info only works for the first collection. Michael is going to fix this.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java (modified) (15 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

@@ -298 +298 @@
      * @param classifier The classifier <strong>File</strong> you wish to load.
      */
-    private void loadClassifier(String classifier, String lang) {
-    ///ystem.err.println("Attempting to parse " + classifier);
+    private void loadClassifier(String classifier, String lang, String collection) {
+    ///ystem.err.println("Attempting to parse " + classifier + " for collection "+collection);
     Document document = null;
     InputStream input_stream = null;
@@ -313 +313 @@
         }
         else {
-        String args[] = null;
-        if(Utility.isWindows()) {
-            args = new String[6];
-            if(Configuration.perl_path != null) {
-            args[0] = Configuration.perl_path;
-            }
-            else {
-            args[0] = "Perl.exe";
-            }
-            args[1] = LocalGreenstone.getBinScriptDirectoryPath() + "classinfo.pl";
-            args[2] = "-xml";
-            args[3] = "-language";
-            args[4] = lang;
-            args[5] = getClassifierName(classifier);
-        }
-        else {
-            args = new String[5];
-            args[0] = "classinfo.pl";
-            args[1] = "-xml";
-            args[2] = "-language";
-            args[3] = lang;
-            args[4] = getClassifierName(classifier);
-        }
+        ArrayList args = new ArrayList();
+        if (Utility.isWindows()) {
+            args.add(Configuration.perl_path);
+            args.add("-S");
+        }
+        args.add(LocalGreenstone.getBinScriptDirectoryPath() + "classinfo.pl");
+        args.add("-xml");
+        args.add("-language");
+        args.add(lang);
+        args.add("-collect");
+        args.add(collection);
+        args.add(getClassifierName(classifier));
 
         // Create the process.
         Runtime runtime = Runtime.getRuntime();
-        Process process = runtime.exec(args);
+        Process process = runtime.exec((String[])args.toArray(new String [0]));
 
         input_stream = process.getErrorStream();
@@ -391 +380 @@
 
         String current_lang = Configuration.getLanguage();
+        String collection_name = Gatherer.c_man.getCollection().getName();
         File files[] = (new File(directory)).listFiles();
-        if(files != null) {
+        File coll_files[] = (new File(Gatherer.c_man.getCollectionClassifiersDirectoryPath())).listFiles();
+        int num_files =0;
+        if (files != null) {
+            num_files += files.length;
+        }
+        if (coll_files != null) {
+            num_files += coll_files.length;
+        }
+        if(num_files > 0) {
             // Create a progress indicator.
-            ParsingProgress progress = new ParsingProgress(Dictionary.get("CDM.ClassifierManager.Parsing.Title"), Dictionary.get("CDM.ClassifierManager.Parsing.Message"), files.length);
-            for(int i = 0; i < files.length; i++) {
-            // We only want to check Perl Modules.
-            if(files[i].getName().endsWith(".pm")) {
-                loadClassifier(files[i].getName(), current_lang);
+            ParsingProgress progress = new ParsingProgress(Dictionary.get("CDM.ClassifierManager.Parsing.Title"), Dictionary.get("CDM.ClassifierManager.Parsing.Message"), num_files);
+            if (coll_files != null) {
+            for (int i=0; i<coll_files.length; i++) {
+                
+                if(coll_files[i].getName().endsWith(".pm")) {
+                loadClassifier(coll_files[i].getName(), current_lang, collection_name);
+                }
+                progress.inc();
             }
-            progress.inc();
+            }
+            if (files != null) {
+            for(int i = 0; i < files.length; i++) {
+                // We only want to check Perl Modules.
+                if(files[i].getName().endsWith(".pm")) {
+                loadClassifier(files[i].getName(), current_lang, collection_name);
+                }
+                progress.inc();
+            }
             }
             progress.dispose();
@@ -420 +429 @@
 
     // Parse XML to build up list of classifier names
-    Node root = document.getDocumentElement();
-
-    NamedNodeMap attributes = root.getAttributes();
-    Node length_node = attributes.getNamedItem("length");
-    String num_classifiers_str = length_node.getNodeValue();
+    Element root = document.getDocumentElement();
+    
+    String num_classifiers_str = root.getAttribute("length");
     int num_classifiers = Integer.parseInt(num_classifiers_str);
     String class_list[] = new String[num_classifiers];
@@ -431 +438 @@
     int i = 0;
     while (node != null) {
-        String node_name = node.getNodeName();
-        if (node_name.equalsIgnoreCase("ClassifyName")) {
-        String name = XMLTools.getValue(node);
-        class_list[i] = name;
+        if (node.getNodeName().equalsIgnoreCase("ClassifyName")) {
+        class_list[i] = XMLTools.getValue(node);
         i++;        
         }
@@ -440 +445 @@
         node = node.getNextSibling();
     }
-
+    
     String current_lang = Configuration.getLanguage();
+    String collection_name = Gatherer.c_man.getCollection().getName();
     if (num_classifiers>0) {
         // Create a progress indicator.
@@ -448 +454 @@
         for (i=0; i<num_classifiers; i++) {
         String classifier = class_list[i];
-        loadClassifier(classifier, current_lang);
+        loadClassifier(classifier, current_lang, collection_name);
         progress.inc();
         }
@@ -515 +521 @@
     implements Control {
     /** A combobox containing all of the known classifiers, including those that may have already been assigned. */
-    private GComboBox classifier = null;
+    private JComboBox classifier_combobox = null;
     /** Button for adding classifiers. */
     private JButton add = null;
@@ -548 +554 @@
 
         ClassifierComboboxListener ccl = new ClassifierComboboxListener();
-        classifier = new GComboBox(getAvailable());
-        classifier.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
-        classifier.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
-        classifier.setEditable(true);
-        classifier.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
-        classifier.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
-        if(classifier.getItemCount() > 0) {
-        classifier.setSelectedIndex(0);
-        ccl.itemStateChanged(new ItemEvent(classifier, 0, null, ItemEvent.SELECTED));
+        classifier_combobox = new JComboBox(getAvailable());
+        classifier_combobox.setEditable(false);
+        if(classifier_combobox.getItemCount() > 0) {
+        classifier_combobox.setSelectedIndex(0);
+        ccl.itemStateChanged(new ItemEvent(classifier_combobox, 0, null, ItemEvent.SELECTED));
         }
 
@@ -585 +587 @@
         add.addActionListener(new AddListener());
         add.addActionListener(CollectionDesignManager.buildcol_change_listener);
-        classifier.addItemListener(ccl);
+        classifier_combobox.addItemListener(ccl);
         configure.addActionListener(new ConfigureListener());
         configure.addActionListener(CollectionDesignManager.buildcol_change_listener);
@@ -619 +621 @@
         classifier_pane.setLayout(new BorderLayout(5,0));
         classifier_pane.add(classifier_label, BorderLayout.WEST);
-        classifier_pane.add(classifier, BorderLayout.CENTER);
+        classifier_pane.add(classifier_combobox, BorderLayout.CENTER);
 
         button_pane.setLayout(new GridLayout(1, 3));
@@ -644 +646 @@
     public void destroy() {
         add = null;
-        classifier = null;
+        classifier_combobox = null;
         classifier_list = null;
         configure = null;
@@ -668 +670 @@
          */
         public void actionPerformed(ActionEvent event) {
-        Object selected_object = classifier.getSelectedItem();
+        Object selected_object = classifier_combobox.getSelectedItem();
         // If there is something in the combobox, but we haven't registered a selection, then add the object and select it!
         if(selected_object != null) {
@@ -677 +679 @@
             Element element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.CLASSIFY_ELEMENT);
             Classifier new_classifier = null;
-            if(base_classifier != null) {
-            DebugStream.println("Creating Classifier based on existing Classifer.");
-            element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, base_classifier.getName());
-            new_classifier = new Classifier(element, base_classifier);
-            }
-            else {
-            DebugStream.println("Creating new custom Classifier.");
-            element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, selected_object.toString());
-            new_classifier = new Classifier(element, null);
-            // Also we add the custom classifier name to the combobox for convienence.
-            classifier.addItem(selected_object);
-            }
+            element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, base_classifier.getName());
+            new_classifier = new Classifier(element, base_classifier);
+            
             element = null;
             // Automatically chain to configuration. This ensures required arguments are filled out.
@@ -714 +707 @@
             if(event.getStateChange() == ItemEvent.SELECTED) {
                 // Retrieve the selected plugin
-                Object current_selection = classifier.getSelectedItem();
-                // And reset the tooltip. If the plugin is null or is a string, then go back to the default message
-                if(current_selection == null || current_selection instanceof String) {
-            classifier.setToolTipText(Dictionary.get("CDM.ClassifierManager.Classifier_Tooltip"));
-                }
-                else {
-                    Classifier current_classifier = (Classifier) current_selection;
-            classifier.setToolTipText(Utility.formatHTMLWidth(current_classifier.getDescription(), 40));
-                    current_classifier = null;
-                }
-                current_selection = null;
+                Classifier current_selection = (Classifier) classifier_combobox.getSelectedItem();
+                // And reset the tooltip. 
+        classifier_combobox.setToolTipText(Utility.formatHTMLWidth(current_selection.getDescription(), 40));
+        current_selection = null;
             }
         }