Fixed bug where all organizationes where tagged as companies

Author: ArnauPrat

src/main/java/ldbc/socialnet/dbgen/serializer/CSVMergeForeign.java

@@ -527,7 +527,7 @@ public void serialize(StudyAt studyAt) {
     public void serialize(Organization organization) {
         Vector<String> arguments = new Vector<String>();
         arguments.add(Long.toString(organization.id));
-        arguments.add(ScalableGenerator.OrganisationType.company.toString());
+        arguments.add(organization.type.toString());
         arguments.add(organization.name);
         arguments.add(DBP.getUrl(organization.name));
         arguments.add(Integer.toString(organization.location));

src/main/java/ldbc/socialnet/dbgen/serializer/CSVOriginal.java

@@ -600,7 +600,7 @@ public void serialize(StudyAt studyAt) {
     public void serialize(Organization organization) {
         Vector<String> arguments = new Vector<String>();
         arguments.add(Long.toString(organization.id));
-        arguments.add(ScalableGenerator.OrganisationType.company.toString());
+        arguments.add(organization.type.toString());
         arguments.add(organization.name);
         arguments.add(DBP.getUrl(organization.name));
         ToCSV(arguments, Files.ORGANISATION.ordinal());

src/main/java/ldbc/socialnet/dbgen/serializer/Turtle.java

@@ -49,6 +49,7 @@
 
 import ldbc.socialnet.dbgen.dictionary.*;
 import ldbc.socialnet.dbgen.generator.DateGenerator;
+import ldbc.socialnet.dbgen.generator.ScalableGenerator;
 import ldbc.socialnet.dbgen.objects.*;
 import ldbc.socialnet.dbgen.vocabulary.DBP;
 import ldbc.socialnet.dbgen.vocabulary.DBPOWL;
@@ -528,7 +529,11 @@ public void serialize(StudyAt studyAt) {
     public void serialize(Organization organization) {
 
         StringBuffer result = new StringBuffer(19000);
-        writeDBPData(DBP.fullPrefixed(organization.name), RDF.type, DBPOWL.Organisation);
+        if( organization.type == ScalableGenerator.OrganisationType.company ) {
+            writeDBPData(DBP.fullPrefixed(organization.name), RDF.type, DBPOWL.Company);
+        } else {
+            writeDBPData(DBP.fullPrefixed(organization.name), RDF.type, DBPOWL.University);
+        }
         writeDBPData(DBP.fullPrefixed(organization.name), FOAF.Name, createLiteral(organization.name));
         createTripleSPO(result, DBP.fullPrefixed(organization.name),
                 SNVOC.locatedIn, DBP.fullPrefixed(locationDic.getLocationName(organization.location)));

src/main/java/ldbc/socialnet/dbgen/vocabulary/DBPOWL.java

@@ -49,6 +49,8 @@ public class DBPOWL {
     public static final String Country         = PREFIX+"Country";
     public static final String Continent       = PREFIX+"Continent";
     public static final String Organisation    = PREFIX+"Organisation";
+    public static final String University      = PREFIX+"University";
+    public static final String Company         = PREFIX+"Company";
     public static final String partOf          = PREFIX+"isPartOf";
 
 	/**