Changeset 6992

Timestamp:

2004-03-09T16:22:47+13:00 (20 years ago)

Author:

kjdon

Message:

now load up plugins and classifiers in the right language

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• ClassifierManager.java (modified) (6 diffs)
• PlugInManager.java (modified) (5 diffs)

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

@@ -304 +304 @@
      * @param classifier The classifier <strong>File</strong> you wish to load.
      */
-    private void loadClassifier(File classifier) {
+    private void loadClassifier(File classifier, String lang) {
     ///ystem.err.println("Attempting to parse " + classifier.toString());
     Document document = null;
@@ -313 +313 @@
         String args[] = null;
         if(Utility.isWindows()) {
-        args = new String[4];
+        args = new String[6];
         if(Gatherer.config.perl_path != null) {
             args[0] = Gatherer.config.perl_path;
@@ -322 +322 @@
         args[1] = Gatherer.config.gsdl_path + "bin" + File.separator + "script" + File.separator + "classinfo.pl";
         args[2] = "-xml";
-        args[3] = getClassifierName(classifier);
+        args[3] = "-language";
+        args[4] = lang;
+        args[5] = getClassifierName(classifier);
         }
         else {
-        args = new String[3];
+        args = new String[5];
         args[0] = "classinfo.pl";
         args[1] = "-xml";
-        args[2] = getClassifierName(classifier);
+        args[2] = "-language";
+        args[3] = lang;
+        args[4] = getClassifierName(classifier);
         }
 
@@ -334 +338 @@
         Runtime runtime = Runtime.getRuntime();
         Process process = runtime.exec(args);
-        BufferedReader error_in = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+        BufferedReader error_in = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8"));
         String line = "";
         StringBuffer xml = new StringBuffer("");
@@ -395 +399 @@
         String directory = Gatherer.config.gsdl_path;
         directory = directory + "perllib" + File.separator + "classify" + File.separator;
+        String current_lang = Gatherer.config.getLanguage();
         File files[] = (new File(directory)).listFiles();
         if(files != null) {
@@ -402 +407 @@
             // We only want to check Perl Modules.
             if(files[i].getName().endsWith(".pm")) {
-            loadClassifier(files[i]);
+            loadClassifier(files[i], current_lang);
             }
             progress.inc();

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

@@ -354 +354 @@
      * @param plugin The plugin <strong>File</strong> you wish to load.
      */
-    private void loadPlugIn(File plugin) {
+    private void loadPlugIn(File plugin, String lang) {
     Document document = null;
+    
     // Run pluginfo on this plugin, and then send the results for parsing.
     try {
         String args[] = null;
         if(Utility.isWindows()) {
-        args = new String[4];
+        args = new String[6];
         if(Gatherer.config.perl_path != null) {
             args[0] = Gatherer.config.perl_path;
@@ -369 +370 @@
         args[1] = Gatherer.config.gsdl_path + "bin" + File.separator + "script" + File.separator + "pluginfo.pl";
         args[2] = "-xml";
-        args[3] = getPlugInName(plugin);
+        args[3] = "-language";
+        args[4] = lang;
+        args[5] = getPlugInName(plugin);
         }
         else {
-        args = new String[3];
+        args = new String[5];
         args[0] = "pluginfo.pl";
         args[1] = "-xml";
-        args[2] = getPlugInName(plugin);
+        args[2] = "-language";
+        args[3] = lang;
+        args[4] = getPlugInName(plugin);
         }
         // Create the process.
@@ -381 +386 @@
         Process process = runtime.exec(args);
         //InputStream input_stream = process.getErrorStream();
-        BufferedReader error_in = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+        BufferedReader error_in = new BufferedReader(new InputStreamReader(process.getErrorStream(), "UTF-8"));
         String line = "";
         StringBuffer xml = new StringBuffer("");
@@ -453 +458 @@
     boolean is_windows = Utility.isWindows();
     boolean is_mac = Utility.isMac();
+    String current_lang = Gatherer.config.getLanguage();
     if(files != null) {
         // Create a progress indicator.
@@ -462 +468 @@
             // don't load DBPlug for windows
             } else {
-            loadPlugIn(files[i]);
+            loadPlugIn(files[i], current_lang);
             }
         }