From a42d2339447d1c478c2800ee4e7ecf52caf759fa Mon Sep 17 00:00:00 2001
From: low012 <low012@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Mon, 30 Jul 2007 21:00:42 +0000
Subject: [PATCH] *) Filename for output file is created from language code +
 .ldf now (e.g. en-GB.ldf)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4012 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 .../language/languageDataExtractor.java       | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/source/de/anomic/language/languageDataExtractor.java b/source/de/anomic/language/languageDataExtractor.java
index 44c7d5e76..2198a5ab1 100644
--- a/source/de/anomic/language/languageDataExtractor.java
+++ b/source/de/anomic/language/languageDataExtractor.java
@@ -85,7 +85,7 @@ public class languageDataExtractor {
         String output = "";
         String sKey = "";
 
-        //Program started with arguments 'input', 'output', 'data', 'name'?
+        //Program started with arguments 'input', 'data', 'name'?
         if (args.length <= 4) {
 
             for(int i=0;i<args.length;i++){
@@ -94,8 +94,6 @@ public class languageDataExtractor {
 
                 if (temp.startsWith("input=")) {
                     input = temp.substring(6);
-                } else if (temp.startsWith("output=")) {
-                    output = temp.substring(7);
                 } else if (temp.startsWith("name=")) {
                     name = temp.substring(5);
                 } else if (temp.startsWith("code=")) {
@@ -106,25 +104,21 @@ public class languageDataExtractor {
         }
 
         //Ask user if arguments were not used when starting program.
-        if ((input == "") || (output == "") || (name == "") || (code == "")) {
+        if ((input.equals("")) || (output.equals("")) || (name.equals("")) || (code.equals(""))) {
             BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
             try {
-                if(input == "") {
+                if(input.equals("")) {
                     System.out.print("Name of file text is to be read from: ");
                     input = in.readLine();
                 }
-                if(name == "") {
+                if(name.equals("")) {
                     System.out.print("Name of the language the text is written in: ");
                     name = in.readLine();
                 }
-                if(code == "") {
+                if(code.equals("")) {
                     System.out.print("Code of the language the text is writen in (e.g. en-GB): ");
                     code = in.readLine();
                 }
-                if(output == "") {
-                    System.out.print("Name of file data is to be written to: ");
-                    output = in.readLine();
-                }
             }
             catch (IOException e) {
                 System.out.println(e);
@@ -132,6 +126,9 @@ public class languageDataExtractor {
             }
         }
 
+        //Creating filename from language code plus .ldf (language data file)
+        output = code + ".ldf";
+
         //Trying to open input file.
         try {
             inputFile = new BufferedReader(new InputStreamReader(new FileInputStream(input), "UTF8"));