fixed.4

2 files changed, 117 insertions, 92 deletions

diff --git a/nbproject/project.properties b/nbproject/project.properties
index ab8ae05..b262ab6 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,81 +1,81 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=Goldfarmer
-application.vendor=maurice
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/Goldfarmer.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.joda-time-2.3.jar=lib/joda-time-2.3.jar
-file.reference.postgresql-9.3-1101.jdbc41.jar=lib/postgresql-9.3-1101.jdbc41.jar
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${file.reference.joda-time-2.3.jar}:\
-    ${file.reference.postgresql-9.3-1101.jdbc41.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit_4.classpath}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=main.Main
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-project.licensePath=./nbproject/licenseheader.txt
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
+annotation.processing.enabled=true

+annotation.processing.enabled.in.editor=false

+annotation.processing.processors.list=

+annotation.processing.run.all.processors=true

+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output

+application.title=Goldfarmer

+application.vendor=maurice

+build.classes.dir=${build.dir}/classes

+build.classes.excludes=**/*.java,**/*.form

+# This directory is removed when the project is cleaned:

+build.dir=build

+build.generated.dir=${build.dir}/generated

+build.generated.sources.dir=${build.dir}/generated-sources

+# Only compile against the classpath explicitly listed here:

+build.sysclasspath=ignore

+build.test.classes.dir=${build.dir}/test/classes

+build.test.results.dir=${build.dir}/test/results

+# Uncomment to specify the preferred debugger connection transport:

+#debug.transport=dt_socket

+debug.classpath=\

+    ${run.classpath}

+debug.test.classpath=\

+    ${run.test.classpath}

+# Files in build.classes.dir which should be excluded from distribution jar

+dist.archive.excludes=

+# This directory is removed when the project is cleaned:

+dist.dir=dist

+dist.jar=${dist.dir}/Goldfarmer.jar

+dist.javadoc.dir=${dist.dir}/javadoc

+endorsed.classpath=

+excludes=

+file.reference.joda-time-2.3.jar=lib/joda-time-2.3.jar

+file.reference.postgresql-9.3-1101.jdbc41.jar=lib/postgresql-9.3-1101.jdbc41.jar

+includes=**

+jar.compress=false

+javac.classpath=\

+    ${file.reference.joda-time-2.3.jar}:\

+    ${file.reference.postgresql-9.3-1101.jdbc41.jar}

+# Space-separated list of extra javac options

+javac.compilerargs=

+javac.deprecation=false

+javac.processorpath=\

+    ${javac.classpath}

+javac.source=1.7

+javac.target=1.7

+javac.test.classpath=\

+    ${javac.classpath}:\

+    ${build.classes.dir}:\

+    ${libs.junit_4.classpath}

+javac.test.processorpath=\

+    ${javac.test.classpath}

+javadoc.additionalparam=

+javadoc.author=false

+javadoc.encoding=${source.encoding}

+javadoc.noindex=false

+javadoc.nonavbar=false

+javadoc.notree=false

+javadoc.private=false

+javadoc.splitindex=true

+javadoc.use=true

+javadoc.version=false

+javadoc.windowtitle=

+main.class=main.Main

+manifest.file=manifest.mf

+meta.inf.dir=${src.dir}/META-INF

+mkdist.disabled=false

+platform.active=default_platform

+project.licensePath=./nbproject/licenseheader.txt

+run.classpath=\

+    ${javac.classpath}:\

+    ${build.classes.dir}

+# Space-separated list of JVM arguments used when running the project.

+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.

+# To set system properties for unit tests define test-sys-prop.name=value:

+run.jvmargs=

+run.test.classpath=\

+    ${javac.test.classpath}:\

+    ${build.test.classes.dir}

+source.encoding=UTF-8

+src.dir=src

+test.src.dir=test

diff --git a/src/main/Analyzor.java b/src/main/Analyzor.java
index 819f7c9..05bc6b8 100644
--- a/src/main/Analyzor.java
+++ b/src/main/Analyzor.java
@@ -521,32 +521,57 @@ public class Analyzor {
         

         String line;

         String[] values;

+        Boolean printed;

+        HashSet<String> used;

         

         //for every line

         while(sc.hasNextLine()){

             //get the values (and so the word)

             line = sc.nextLine();

             values = line.split(",");

+            printed = false;

             

             //divide into categories

-            if(toCategory.containsKey(values[0])){

-                values[0] = toCategory.get(values[0]);

+            //substring

+            used = new HashSet<>();

+            for(String key : toCategory.keySet()){

+                if(values[0].contains(key) && !used.contains(toCategory.get(key))){

+                    used.add(toCategory.get(key));

+                    String[] newValues = values;

+                    newValues[0] = toCategory.get(key);

+                    //print it

+                    writer.println(csvLine(newValues));

+                    printed = true;

+                }

+            }

+            //exact word

+            if(toCategory.containsKey("#" + values[0])){

+                values[0] = toCategory.get("#" + values[0]);

             }

             

             //print it

-            int length = values.length;

-            int index = 0;

-            writer.println("");

-            for(String s : values){

-                writer.print(s);

-                if(!(index == length - 1)){

-                    writer.print(",");

-                }

-                index++;

+            if(!printed){

+                writer.println(csvLine(values));

             }

         }

         writer.close();

     }

+        

+    String csvLine(String[] values){

+        int length = values.length;

+        int index = 0;

+        String result = "";

+

+        for(String s : values){

+            result += s;

+            if(!(index == length - 1)){

+                result += ",";

+            }

+            index++;

+        }

+        

+        return result;

+    }

 

     //replaces punctuation so it will be splitted

     //also removes urls